Maint/deps 2023 12 01

build/composer.json

@@ -53,7 +53,7 @@
 	"require": {
 		"saltus/framework": "dev-main"
 	},
-	"minimum-stability": "dev",
+	"minimum-stability": "stable",
 	"require-dev": {
 		"phpunit/phpunit": "^8"
 	}

build/package.json

@@ -10,24 +10,30 @@
     "homepage": "https://saltus.dev"
   },
   "devDependencies": {
-    "browser-sync": "^2.26.7",
-    "grunt": "^1.0.4",
+    "autoprefixer": "^10.4.16",
+    "browser-sync": "^2.29.3",
+    "cssnano": "^6.0.1",
+    "grunt": "^1.6.1",
     "grunt-checktextdomain": "^1.0.1",
     "grunt-composer": "^0.4.5",
     "grunt-contrib-clean": "^2.0.0",
-    "grunt-contrib-compress": "^1.6.0",
+    "grunt-contrib-compress": "^2.0.0",
+    "grunt-contrib-concat": "^2.1.0",
     "grunt-contrib-copy": "^1.0.0",
-    "grunt-contrib-cssmin": "^3.0.0",
+    "grunt-contrib-cssmin": "^5.0.0",
     "grunt-contrib-watch": "~1.1.0",
-    "grunt-git": "^1.0.14",
+    "grunt-git": "^1.1.1",
     "grunt-notify": "^0.4.5",
-    "grunt-shell": "^3.0.1",
-    "grunt-version": "^1.3.2",
+    "grunt-postcss": "^0.9.0",
+    "grunt-rollup": "^12.0.0",
+    "grunt-shell": "^4.0.0",
+    "grunt-terser": "^2.0.0",
+    "grunt-version": "^3.0.0",
     "grunt-wp-i18n": "^1.0.3",
     "jit-grunt": "^0.10.0",
-    "load-grunt-config": "^3.0.1",
+    "load-grunt-config": "^4.0.1",
     "load-grunt-tasks": "~5.1.0",
-    "semver": "^7.1.1",
+    "semver": "^7.5.4",
     "time-grunt": "~2.0.0"
   },
   "eslintConfig": {

framework-demo.php

@@ -21,8 +21,8 @@
 if ( ! defined( 'WPINC' ) ) {
 	exit;
 }
-if ( file_exists( dirname( __FILE__ ) . '/vendor/autoload.php' ) ) {
-	require_once dirname( __FILE__ ) . '/vendor/autoload.php';
+if ( file_exists( __DIR__ . '/vendor/autoload.php' ) ) {
+	require_once __DIR__ . '/vendor/autoload.php';
 }
 
 if ( class_exists( \Saltus\WP\Framework\Core::class ) ) {
@@ -31,7 +31,7 @@
 	* The path to the plugin root directory is mandatory,
 	* so it loads the models from a subdirectory.
 	*/
-	$framework = new \Saltus\WP\Framework\Core( dirname( __FILE__ ) );
+	$framework = new \Saltus\WP\Framework\Core( __DIR__ );
 	$framework->register();
 
 	/**
@@ -45,9 +45,4 @@ function () use ( $framework ) {
 			$plugin->init();
 		}
 	);
-
 }
-
-
-
-

phpcs.xml

@@ -1,27 +1,83 @@
 <?xml version="1.0"?>
 <ruleset name="Saltus">
-  <description>Saltus Coding Standards.</description>
-
-  <exclude-pattern>*/phpunit.xml*</exclude-pattern>
-  <exclude-pattern>*/languages/*</exclude-pattern>
-  <exclude-pattern>*/tests/*</exclude-pattern>
-  <exclude-pattern>*/node_modules/*</exclude-pattern>
-  <exclude-pattern>*/vendor/*</exclude-pattern>
-
-  <!-- Yoda conditions, we must ignore -->
-  <rule ref="WordPress.PHP.YodaConditions.NotYoda">
-    <severity>0</severity>
-  </rule>
-
-  <!-- Ignore lowercase filenames -->
-  <rule ref="Generic.Files.LowercasedFilename.NotFound">
-    <severity>0</severity>
-  </rule>
-  <rule ref="WordPress.Files.FileName">
-    <severity>0</severity>
-  </rule>
-  <rule ref="WordPress.Files.FileName.InvalidClassFileName">
-    <severity>0</severity>
-  </rule>
-  <rule ref="WordPress-Extra" />
+	<description>Saltus Coding Standards.</description>
+
+	<exclude-pattern>*/phpunit.xml*</exclude-pattern>
+	<exclude-pattern>*/languages/*</exclude-pattern>
+	<exclude-pattern>*/tests/*</exclude-pattern>
+	<exclude-pattern>*/node_modules/*</exclude-pattern>
+	<exclude-pattern>*/vendor/*</exclude-pattern>
+	<exclude-pattern>lib/*</exclude-pattern>
+
+
+	<rule ref="WordPress-Extra">
+
+		<!-- # files -->
+		<!-- Ignore lowercase filenames -->
+		<exclude name="Generic.Files.LowercasedFilename.NotFound"/>
+		<!-- Do not enforce 'class-' prefix and hyffens -->
+		<exclude name="WordPress.Files.FileName.InvalidClassFileName"/>
+		<exclude name="WordPress.Files.FileName.NotHyphenatedLowercase"/>
+
+		<!-- # WP VIP: Generates too many false positives -->
+		<exclude name="WordPress.WP.CapitalPDangit.Misspelled"/>
+		<exclude name="WordPress.WP.CapitalPDangit.MisspelledInComment"/>
+
+		<!-- # wp nonsense -->
+		<!-- ignore yoda -->
+		<exclude name="WordPress.PHP.YodaConditions.NotYoda"/>
+		<!-- too many rules -->
+		<exclude name="PEAR.Functions.FunctionCallSignature.requiredSpacesAfterOpen"/>
+		<exclude name="PEAR.Functions.FunctionCallSignature.requiredSpacesBeforeClose"/>
+		<exclude name="PEAR.Functions.FunctionCallSignature.ContentAfterOpenBracket"/>
+		<exclude name="PEAR.Functions.FunctionCallSignature.CloseBracketLine"/>
+		<exclude name="Generic.Functions.FunctionCallArgumentSpacing.TooMuchSpaceAfterComma"/>
+		<!-- Allow ternary forms -->
+		<exclude name="Universal.Operators.DisallowShortTernary.Found"/>
+		<!-- Prefer [] instead of array() -->
+		<exclude name="Universal.Arrays.DisallowShortArraySyntax.Found"/>
+		<exclude name="Generic.Arrays.DisallowLongArraySyntax.Found"/>
+		<!-- common -->
+		<exclude name="PSR2.Classes.ClassDeclaration.ImplementsLine"/>
+		<exclude name="PSR2.Classes.ClassDeclaration.ExtendsLine"/>
+	</rule>
+
+
+	<!-- Add extra word delimiter for hooks. -->
+	<rule ref="WordPress.NamingConventions.ValidHookName">
+		<properties>
+			<property name="additionalWordDelimiters" value="/"/>
+		</properties>
+	</rule>
+
+	<!-- # from yoast: https://github.com/Yoast/yoastcs/blob/develop/Yoast/ruleset.xml -->
+	<!-- If a conscious choice has been made for a non-strict comparison, that's ok.
+		I.e. when `strict` has been explicitely set to `false` in an array comparison,
+		it will be allowed. -->
+	<exclude name="WordPress.PHP.StrictInArray.FoundNonStrictFalse"/>
+	<!-- In contrast to WPCS: disallow Yoda conditions. (PHPCS 3.5.0) -->
+	<rule ref="Generic.ControlStructures.DisallowYodaConditions"/>
+
+	<!-- # code quality -->
+	<!-- cyclomatic -->
+	<rule ref="Generic.Metrics.CyclomaticComplexity">
+		<properties>
+			<property name="complexity" value="10"/>
+			<property name="absoluteComplexity" value="20"/>
+		</properties>
+	</rule>
+	<!-- php compat -->
+	<rule ref="PHPCompatibility"/>
+
+	<!-- phpcs parameters -->
+	<file>./src/</file>
+	<arg name="extensions" value="php" />
+	<arg name="encoding" value="UTF-8" />
+	<arg value="ps"/>
+	<arg name="colors"/>
+	<arg name="parallel" value="12"/>
+	<config name="testVersion" value="7.0-"/>
+
+	<config name="installed_paths" value="/srv/dev/coding_standards/wpcs/,/srv/dev/coding_standards/PHPCSUtils/,/srv/dev/coding_standards/PHPCSExtra/,/srv/dev/coding_standards/PHPCompatibility" />
+
 </ruleset>

src/Core.php

@@ -82,5 +82,4 @@ private function set_assets() {
 		$assets = new Plugin\Assets( $this );
 		$assets->load_assets();
 	}
-
 }

src/Loader.php

@@ -35,7 +35,6 @@ class Loader {
 	 */
 	public function __construct( Core $core ) {
 		$this->core = $core;
-
 	}
 
 	/**
@@ -45,4 +44,3 @@ public function __construct( Core $core ) {
 	public function run() {
 	}
 }
-

src/Plugin/I18n.php

@@ -35,5 +35,4 @@ public function load_plugin_textdomain( string $plugin_dirname ) {
 			$plugin_dirname . '/languages/'
 		);
 	}
-
 }

src/models/post-type-all.php

@@ -30,7 +30,7 @@
 			),
 			'shortcode'      => array(
 				'title'    => __( 'Shortcode', 'framework-demo' ),
-				'function' => function() {
+				'function' => function () {
 					global $post;
 					echo esc_html( '[display-book id="' . $post->ID . '"]' );
 				},
@@ -82,10 +82,6 @@
 				'attributes'            => __( 'Book Attributes', 'framework-demo' ),
 				'insert_into_item'      => __( 'Insert into book', 'framework-demo' ),
 				'uploaded_to_this_item' => __( 'Uploaded to this book', 'framework-demo' ),
-				'featured_image'        => __( 'Featured Image', 'framework-demo' ),
-				'set_featured_image'    => __( 'Set featured image', 'framework-demo' ),
-				'remove_featured_image' => __( 'Remove featured image', 'framework-demo' ),
-				'use_featured_image'    => __( 'Use featured image', 'framework-demo' ),
 				'filter_items_list'     => __( 'Filter books list', 'framework-demo' ),
 				'items_list_navigation' => __( 'Books list navigation', 'framework-demo' ),
 				'items_list'            => __( 'Books list', 'framework-demo' ),
@@ -109,14 +105,19 @@
 			],
 			'bulk_messages' => [
 				'updated_singular'   => __( 'Book updated. Yay!', 'framework-demo' ),
+				/* translators: %s: Number of Books. */
 				'updated_plural'     => __( '%s Books updated. Yay!', 'framework-demo' ),
 				'locked_singular'    => __( 'Book not updated, somebody is editing it', 'framework-demo' ),
+				/* translators: %s: Number of Books. */
 				'locked_plural'      => __( '%s Books not updated, somebody is editing them', 'framework-demo' ),
 				'deleted_singular'   => __( 'Book permanetly deleted. Fahrenheit 451 team was here?', 'framework-demo' ),
+				/* translators: %s: Number of Books. */
 				'deleted_plural'     => __( '%s Books permanently deleted. Why? :(', 'framework-demo' ),
 				'trashed_singular'   => __( 'Book moved to the trash. I\'m sad :(', 'framework-demo' ),
+				/* translators: %s: Number of Books. */
 				'trashed_plural'     => __( '%s Books moved to the trash. Why? :(', 'framework-demo' ),
 				'untrashed_singular' => __( 'Book recovered from trash. Well done!', 'framework-demo' ),
+				/* translators: %s: Number of Books. */
 				'untrashed_plural'   => __( '%s Books saved from the enemies!', 'framework-demo' ),
 			],
 			// overrides some of the available button labels and placeholders
@@ -254,7 +255,6 @@
 					],
 				],
 
-
 				'custom'  => [
 					'title'  => __( 'CSS', 'framework-demo' ),
 					'desc'   => __( 'Add custom styles to the pages loading the layouts.', 'framework-demo' ),

src/models/taxonomy-multiple.php

@@ -16,16 +16,16 @@
 		'type'         => 'tag',
 		'name'         => 'country',
 		'labels'       => [
-			'has_one'  => 'Country',
-			'has_many' => 'Countries',
+			'has_one'   => 'Country',
+			'has_many'  => 'Countries',
 			'overrides' => [
 				'labels' => [
 					'menu_name' => 'Places',
-				]
+				],
 			],
 		],
 		// args - third parameter for register_taxonomy
-		'options' => [
+		'options'      => [
 			'description'  => 'Description for this taxonomy',
 			'public'       => true,
 			'show_in_menu' => true,