Merge pull request #737 from bedita/chore/replace-aliased-classes

Replace more aliased classes
bedita · Mar 23, 2022 · 00c09e8 · 00c09e8
2 parents 4cac7b5 + 3d89682
commit 00c09e8
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
@@ -161,6 +161,9 @@ jobs:
       - name: 'Install dependencies with Composer'
         run: 'composer install --prefer-dist --no-interaction'
 
+      - name: 'Dump Composer autoloader'
+        run: 'composer dump-autoload --classmap-authoritative --no-cache'
+
       - name: 'Run PHPUnit with coverage'
         run: 'vendor/bin/phpunit --coverage-clover=clover.xml'
 

diff --git a/composer.json b/composer.json
@@ -71,7 +71,8 @@
         "sort-packages": true,
         "allow-plugins": {
             "cakephp/plugin-installer": true,
-            "wikimedia/composer-merge-plugin": true
+            "wikimedia/composer-merge-plugin": true,
+            "dealerdirect/phpcodesniffer-composer-installer": true
         }
     },
     "extra": {

diff --git a/src/Command/ConsoleCommand.php b/src/Command/ConsoleCommand.php
@@ -16,8 +16,8 @@
  */
 namespace App\Command;
 
+use Cake\Command\Command;
 use Cake\Console\Arguments;
-use Cake\Console\Command;
 use Cake\Console\ConsoleIo;
 use Cake\Console\ConsoleOptionParser;
 use Cake\Log\Log;

diff --git a/src/Core/Exception/UploadException.php b/src/Core/Exception/UploadException.php
@@ -13,12 +13,12 @@
 
 namespace App\Core\Exception;
 
-use Cake\Core\Exception\Exception;
+use Cake\Core\Exception\CakeException;
 
 /**
  * Exception raised when uploading from form fails
  */
-class UploadException extends Exception
+class UploadException extends CakeException
 {
     /**
      * Array to map upload error codes with proper message string