Merge remote-tracking branch 'upstream/master'

.env.dist

@@ -3,9 +3,3 @@
 #
 # Copy to `.env` in order to use it.
 #
-
-# APC test are disabled.
-#
-# To enable them in order to provide a fix, set to "on".
-#
-APC_ENABLE_CLI=off

.gitattributes

@@ -8,4 +8,5 @@
 docker-compose.yml     export-ignore
 phpstan.neon           export-ignore
 phpunit.xml            export-ignore
+test/                  export-ignore
 tests/                 export-ignore

.github/workflows/continuous-integration.yml

@@ -18,9 +18,9 @@ jobs:
       matrix:
         php-version:
           - "7.4"
-          - "8.0"
           - "8.1"
           - "8.2"
+          - "8.3"
         memcached-version:
           - "1.6"
 
@@ -30,21 +30,23 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: "true"
 
       - name: Install PHP
         uses: shivammathur/setup-php@v2
         with:
           php-version: "${{ matrix.php-version }}"
+          extensions: apcu
+          ini-values: apc.enable_cli=1
 
       - name: Get composer cache directory
         id: composer-cache
         run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
       - name: Cache dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}

.github/workflows/lint.yml

@@ -1,31 +1,43 @@
 name: "Code Linting"
 on:
   push:
+    paths:
+      - .php-cs-fixer.dist.php
+      - autoload.php
+      - lib/**
+      - data/**
+      - tests/**
     branches:
       - master
   pull_request:
+    paths:
+      - .php-cs-fixer.dist.php
+      - autoload.php
+      - lib/**
+      - data/**
+      - tests/**
 
 jobs:
   php-cs-fixer:
     name: 'PHP-CS-Fixer'
     runs-on: 'ubuntu-latest'
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.2
-          tools: php-cs-fixer, cs2pr
+          php-version: 7.4
+          tools: php-cs-fixer:3.52, cs2pr
 
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         with:
           path: '.php-cs-fixer.cache'
-          key: ${{ github.repository }}-8.2-phpcsfixer-${{ github.ref_name }}
+          key: ${{ github.repository }}-7.4-phpcsfixer-${{ github.ref_name }}
           restore-keys: |
-            ${{ github.repository }}-8.2-phpcsfixer-master
-            ${{ github.repository }}-8.2-phpcsfixer-
+            ${{ github.repository }}-7.4-phpcsfixer-master
+            ${{ github.repository }}-7.4-phpcsfixer-
 
       - name: Run PHP-CS-Fixer
         # Using cs2pr settings, see: https://github.com/shivammathur/setup-php#tools-with-checkstyle-support
-        run: 'php-cs-fixer fix --dry-run --format checkstyle | cs2pr'
+        run: 'php-cs-fixer fix --dry-run --format=checkstyle | cs2pr'

.gitignore

@@ -1,3 +1,5 @@
+.cache/
+
 /test/functional/fixtures/cache
 /test/functional/fixtures/log
 /lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/*/doctrine/base/
@@ -6,4 +8,3 @@
 lib/plugins/sfDoctrinePlugin/test/functional/fixtures/log/
 /vendor
 /composer.lock
-.php-cs-fixer.cache

.gitmodules

@@ -1,6 +1,6 @@
 [submodule "lib/vendor/swiftmailer"]
 	path = lib/vendor/swiftmailer
-	url = https://github.com/swiftmailer/swiftmailer.git
+	url = https://github.com/FriendsOfSymfony1/swiftmailer.git
 	branch = 5.x
 [submodule "lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine"]
 	path = lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine

.php-cs-fixer.dist.php

@@ -5,24 +5,32 @@
     ->in(__DIR__.'/lib')
     ->in(__DIR__.'/data/bin')
     ->in(__DIR__.'/test')
-    ->append(array(__FILE__))
+    ->append([__FILE__])
     // Exclude PHP classes templates/generators, which are not valid PHP files
     ->exclude('task/generator/skeleton/')
     ->exclude('plugins/sfDoctrinePlugin/data/generator/')
+    ->exclude('plugins/sfDoctrinePlugin/test/functional/fixtures/')
+
+    // Exclude sub-modules folders
+    ->exclude('plugins/sfDoctrinePlugin/lib/vendor/doctrine')
+
+    // Exclude generated files (whole directories)
+    ->exclude('functional/fixtures/cache')
+    ->exclude('functional/fixtures/log')
+
     // Exclude generated files (single files)
     ->notPath('unit/config/fixtures/sfDefineEnvironmentConfigHandler/prefix_result.php')
     ->notPath('unit/config/fixtures/sfFilterConfigHandler/result.php')
 ;
 
 $config = new PhpCsFixer\Config();
-$config->setRules(array(
-    '@PhpCsFixer' => true,
-    '@Symfony' => true,
-    'array_syntax' => array(
-        'syntax' => 'long',
-    ),
-))
-    ->setCacheFile('.php-cs-fixer.cache')
+$config
+    ->setRules([
+        '@PhpCsFixer' => true,
+        '@Symfony' => true,
+        'array_syntax' => ['syntax' => 'short'],
+    ])
+    ->setCacheFile('.cache/php-cs-fixer.cache')
     ->setFinder($finder)
 ;