Merge remote-tracking branch 'origin/4.x'

Author: markstory

.editorconfig

@@ -0,0 +1,16 @@
+; This file is for unifying the coding style for different editors and IDEs.
+; More information at http://editorconfig.org
+
+root = false
+
+[*]
+indent_style = space
+indent_size = 4
+charset = "utf-8"
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.yml]
+indent_style = space
+indent_size = 2

.gitignore

@@ -2,3 +2,5 @@
 /tags
 /vendor
 /composer.lock
+/.idea
+.phpunit.result.cache

.travis.yml

@@ -1,46 +1,40 @@
 language: php
 
 php:
-  - 5.6
-  - 7.0
-  - 7.1
   - 7.2
   - 7.3
 
 env:
   global:
     - DEFAULT=1
-    - COVERAGE=0
-    - PHPCS=0
-
+  
 matrix:
   fast_finish: true
 
   include:
     - php: 7.3
-      env: PHPCS=1
+      env: PHPCS=1 DEFAULT=0
 
     - php: 7.3
-      env: COVERAGE=1
+      env: COVERAGE=1 DEFAULT=0
 
 before_script:
   - phpenv rehash
 
 install:
   - composer self-update
   - composer install --prefer-dist --no-interaction --dev
+  - if [[ $PHPSTAN = 1 ]]; then composer stan-setup; fi
 
 script:
-  - if [[ $DEFAULT == 1 ]]; then vendor/bin/phpunit; fi
-
-  - if [[ $PHPCS == 1 ]]; then vendor/bin/phpcs -p --extensions=php --standard=vendor/cakephp/cakephp-codesniffer/CakePHP ./src ./tests; fi
-
-  - if [[ $COVERAGE == 1 ]]; then phpdbg -qrr vendor/bin/phpunit --coverage-clover=clover.xml || true; fi
-  - if [[ $COVERAGE == 1 ]]; then wget -O codecov.sh https://codecov.io/bash; fi
-  - if [[ $COVERAGE == 1 ]]; then bash codecov.sh; fi
+  - if [[ $DEFAULT = 1 ]]; then composer test; fi
+  - if [[ $COVERAGE = 1 ]]; then composer coverage-test; fi
+  - if [[ $PHPCS = 1 ]]; then composer cs-check; fi
+  - if [[ $PHPSTAN = 1 ]]; then composer stan; fi
 
 after_success:
-  - if [[ $COVERAGE == 1 ]]; then bash <(curl -s https://codecov.io/bash); fi
+  - if [[ $COVERAGE = 1 ]]; then bash <(curl -s https://codecov.io/bash); fi
 
+  
 notifications:
   email: false

composer.json

@@ -17,12 +17,13 @@
     "source": "https://github.com/markstory/asset_compress"
   },
   "require": {
-    "cakephp/cakephp": ">=3.7.0 <4.0.0",
+    "php": ">=7.2.0",
+    "cakephp/cakephp": "^4.0",
     "markstory/mini-asset": ">=1.4.0 <2.0.0"
   },
   "require-dev": {
-    "phpunit/phpunit": "^5.7.14|^6.0",
-    "cakephp/cakephp-codesniffer": "~2.1"
+    "phpunit/phpunit": "~8.5.0",
+    "cakephp/cakephp-codesniffer": "^4.0"
   },
   "autoload": {
     "psr-4": {
@@ -41,5 +42,20 @@
     "patchwork/jshrink": "For using the JShrink filter.",
     "scssphp/scssphp": "For using the ScssPHP filter.",
     "leafo/lessphp": "For using the LessPHP filter."
-  }
+  },
+    "scripts": {
+        "check": [
+            "@cs-check",
+            "@test",
+            "@stan"
+        ],
+        "cs-check": "phpcs -p --standard=vendor/cakephp/cakephp-codesniffer/CakePHP src/ tests/TestCase/",
+        "cs-fix": "phpcbf --standard=vendor/cakephp/cakephp-codesniffer/CakePHP src/ tests/TestCase/",
+        "test": "phpunit --stderr",
+        "stan": "phpstan analyse src/ && psalm --show-info=false",
+        "stan-test": "phpstan analyse tests/",
+        "psalm": "psalm",
+        "stan-setup": "cp composer.json composer.backup && composer require --dev phpstan/phpstan:^0.11 vimeo/psalm:^3.0 && mv composer.backup composer.json",
+        "coverage-test": "phpunit --stderr --coverage-clover=clover.xml"
+    }
 }

config/bootstrap.php

@@ -1,10 +1 @@
 <?php
-use AssetCompress\Middleware\AssetCompressMiddleware;
-use Cake\Core\Configure;
-use Cake\Event\EventManager;
-use Cake\Routing\DispatcherFactory;
-
-$appClass = Configure::read('App.namespace') . '\Application';
-if (!class_exists($appClass)) {
-    deprecationWarning('You need to upgrade to the new Http Libraries to use AssetCompress.');
-}

phpstan.neon

@@ -0,0 +1,5 @@
+parameters:
+    level: 6
+    autoload_files:
+        - tests/bootstrap.php
+    ignoreErrors:

src/AssetScanner.php

@@ -1,9 +1,9 @@
 <?php
+declare(strict_types=1);
+
 namespace AssetCompress;
 
-use Cake\Core\App;
 use Cake\Core\Plugin as CorePlugin;
-use Cake\Utility\Inflector;
 use MiniAsset\AssetScanner as BaseScanner;
 use RuntimeException;
 
@@ -18,8 +18,8 @@ class AssetScanner extends BaseScanner
     /**
      * @const Pattern for various prefixes.
      */
-    const THEME_PATTERN = '/^(?:t|theme)\:/';
-    const PLUGIN_PATTERN = '/^(?:p|plugin)\:(.*)\:(.*)$/';
+    public const THEME_PATTERN = '/^(?:t|theme)\:/';
+    public const PLUGIN_PATTERN = '/^(?:p|plugin)\:(.*)\:(.*)$/';
 
     /**
      * The current theme if there is one.
@@ -76,7 +76,7 @@ protected function _expandTheme($file)
      * Resolve a plugin file to its full path.
      *
      * @param string $file The theme file to find.
-     * @throws RuntimeException when plugins are missing.
+     * @throws \RuntimeException when plugins are missing.
      * @return string The expanded path
      */
     protected function _expandPlugin($file)

src/Config/ConfigFinder.php

@@ -15,7 +15,6 @@
  */
 class ConfigFinder
 {
-
     /**
      * Load all configuration files in the application.
      *

src/Factory.php

@@ -1,20 +1,12 @@
 <?php
+declare(strict_types=1);
+
 namespace AssetCompress;
 
-use AssetCompress\AssetScanner;
-use AssetCompress\Filter\FilterRegistry;
 use Cake\Core\App;
 use Cake\Core\Configure;
-use MiniAsset\AssetCollection;
-use MiniAsset\AssetConfig;
-use MiniAsset\AssetTarget;
 use MiniAsset\Factory as BaseFactory;
-use MiniAsset\File\Local;
-use MiniAsset\File\Remote;
-use MiniAsset\Output\AssetCacher;
-use MiniAsset\Output\AssetWriter;
 use MiniAsset\Output\Compiler;
-use RuntimeException;
 
 /**
  * A factory for various object using a config file.
@@ -86,7 +78,7 @@ public function scanner($paths)
     protected function buildFilter($name, $config)
     {
         $className = App::className($name, 'Filter');
-        if (!class_exists($className)) {
+        if (!class_exists((string)$className)) {
             $className = App::className('AssetCompress.' . $name, 'Filter');
         }
         $className = $className ?: $name;

src/Filter/ImportInline.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace AssetCompress\Filter;
 
 use AssetCompress\AssetScanner;
@@ -23,7 +25,7 @@ protected function scanner()
         }
         $this->scanner = new AssetScanner(
             $this->_settings['paths'],
-            isset($this->_settings['theme']) ? $this->_settings['theme'] : null
+            $this->_settings['theme'] ?? null
         );
 
         return $this->scanner;