Merge pull request #1372 from JimTools/bugfix/cs-drift

CS Fixes

Author: makasim

.github/workflows/ci.yml

@@ -69,7 +69,7 @@ jobs:
 
       - run: sed -i 's/525568/16777471/' vendor/kwn/php-rdkafka-stubs/stubs/constants.php
 
-      - run: ./bin/php-cs-fixer fix --config=.php_cs.php --no-interaction --dry-run --diff -v --path-mode=intersection -- ${{ env.GIT_DIFF_FILTERED }}
+      - run: ./bin/php-cs-fixer fix --config=.php-cs-fixer.dist.php --no-interaction --dry-run --diff -v --path-mode=intersection -- ${{ env.GIT_DIFF_FILTERED }}
         if: env.GIT_DIFF_FILTERED
 
   unit_tests:

.gitignore

@@ -1,20 +1,21 @@
 *~
 /.idea/
 bin/doctrine*
-bin/php-cs-fixer
-bin/phpunit
-bin/sql-formatter
-bin/phpstan
-bin/jp.php
-bin/php-parse
-bin/google-cloud-batch
+bin/php-cs-fixer*
+bin/phpunit*
+bin/sql-formatter*
+bin/phpstan*
+bin/jp.php*
+bin/php-parse*
+bin/google-cloud-batch*
+bin/patch-type-declarations*
 bin/thruway
-bin/phpstan.phar
-bin/var-dump-server
-bin/yaml-lint
+bin/var-dump-server*
+bin/yaml-lint*
 vendor
 var
 .php_cs
 .php_cs.cache
 composer.lock
 .phpunit.result.cache
+.php-cs-fixer.cache

.php_cs.php renamed to .php-cs-fixer.dist.php

@@ -1,6 +1,7 @@
 <?php
 
 return (new PhpCsFixer\Config())
+    ->setParallelConfig(PhpCsFixer\Runner\Parallel\ParallelConfigFactory::detect())
     ->setRiskyAllowed(true)
     ->setRules(array(
         '@Symfony' => true,

bin/fix-symfony-version.php

@@ -1,14 +1,14 @@
 <?php
 
 if (empty($argv[1])) {
-    throw new \LogicException('The new symfony version must be provided');
+    throw new LogicException('The new symfony version must be provided');
 }
 
 $newVersion = $argv[1];
 
 $composer = file_get_contents(__DIR__.'/../composer.json');
 
-$updatedComposer = preg_replace('/"symfony\/(.*)": ".*"/', '"symfony/$1": "'.$newVersion.'"', $composer).PHP_EOL;
-echo $updatedComposer.PHP_EOL;
+$updatedComposer = preg_replace('/"symfony\/(.*)": ".*"/', '"symfony/$1": "'.$newVersion.'"', $composer).\PHP_EOL;
+echo $updatedComposer.\PHP_EOL;
 
 file_put_contents(__DIR__.'/../composer.json', $updatedComposer);

composer.json

@@ -4,8 +4,8 @@
   "minimum-stability": "beta",
   "homepage": "https://enqueue.forma-pro.com/",
   "scripts": {
-    "cs-fix": "bin/php-cs-fixer fix --config=.php_cs.php",
-    "cs-lint": "bin/php-cs-fixer fix --config=.php_cs.php --no-interaction --dry-run --diff",
+    "cs-fix": "bin/php-cs-fixer fix",
+    "cs-lint": "bin/php-cs-fixer fix --no-interaction --dry-run --diff",
     "phpstan": "bin/phpstan analyse --memory-limit=512M -c phpstan.neon"
   },
   "require": {
@@ -136,4 +136,3 @@
     }
   }
 }
-

docker-compose.yml

@@ -7,7 +7,7 @@ services:
     build:
       context: docker
       args:
-        PHP_VERSION: "${PHP_VERSION:-7.4}"
+        PHP_VERSION: "${PHP_VERSION:-8.1}"
     depends_on:
       - rabbitmq
       - mysql

docker/bin/refresh-mysql-database.php

@@ -5,12 +5,12 @@
 require_once getcwd().'/vendor/autoload.php';
 
 $dsn = getenv('DOCTRINE_DSN');
-$database = trim(parse_url($dsn, PHP_URL_PATH), '/');
+$database = trim(parse_url($dsn, \PHP_URL_PATH), '/');
 
 $dbalContext = (new DbalConnectionFactory($dsn))->createContext();
 
 $dbalContext->getDbalConnection()->getSchemaManager()->dropAndCreateDatabase($database);
 $dbalContext->getDbalConnection()->exec('USE '.$database);
 $dbalContext->createDataBaseTable();
 
-echo 'MySQL Database is updated'.PHP_EOL;
+echo 'MySQL Database is updated'.\PHP_EOL;

docker/bin/refresh-postgres-database.php

@@ -11,4 +11,4 @@
 $dbalContext->getDbalConnection()->getSchemaManager()->dropAndCreateDatabase('postgres');
 $dbalContext->createDataBaseTable();
 
-echo 'Postgresql Database is updated'.PHP_EOL;
+echo 'Postgresql Database is updated'.\PHP_EOL;

docker/bin/test.sh

@@ -44,7 +44,7 @@ waitForService localstack 4566 50
 php docker/bin/refresh-mysql-database.php || exit 1
 php docker/bin/refresh-postgres-database.php  || exit 1
 php pkg/job-queue/Tests/Functional/app/console doctrine:database:create --if-not-exists || exit 1
-php pkg/job-queue/Tests/Functional/app/console doctrine:schema:update --force || exit 1
+php pkg/job-queue/Tests/Functional/app/console doctrine:schema:update --force --complete || exit 1
 
 #php pkg/enqueue-bundle/Tests/Functional/app/console.php config:dump-reference  enqueue
 bin/phpunit "$@"

pkg/amqp-bunny/AmqpConnectionFactory.php

@@ -26,7 +26,7 @@ class AmqpConnectionFactory implements InteropAmqpConnectionFactory, DelayStrate
     private $client;
 
     /**
-     * @see \Enqueue\AmqpTools\ConnectionConfig for possible config formats and values
+     * @see ConnectionConfig for possible config formats and values
      *
      * @param array|string|null $config
      */
@@ -89,10 +89,10 @@ private function establishConnection(): BunnyClient
             $bunnyConfig['timeout'] = $this->config->getConnectionTimeout();
 
             // @see https://github.com/php-enqueue/enqueue-dev/issues/229
-//            $bunnyConfig['persistent'] = $this->config->isPersisted();
-//            if ($this->config->isPersisted()) {
-//                $bunnyConfig['path'] = 'enqueue';//$this->config->getOption('path', $this->config->getOption('vhost'));
-//            }
+            //            $bunnyConfig['persistent'] = $this->config->isPersisted();
+            //            if ($this->config->isPersisted()) {
+            //                $bunnyConfig['path'] = 'enqueue';//$this->config->getOption('path', $this->config->getOption('vhost'));
+            //            }
 
             if ($this->config->getHeartbeat()) {
                 $bunnyConfig['heartbeat'] = $this->config->getHeartbeat();