Fix PHPUnit deprecations

fabpot · nicolas-grekas · commit d0e745d1e629 · 2021-09-21T16:54:21.000+02:00
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -11,25 +11,22 @@ env:
 
 jobs:
     tests:
-        name: "PHP ${{ matrix.php-version }} + ${{ matrix.dependencies }}"
+        name: "PHP ${{ matrix.php }} ${{ matrix.mode }}"
 
         runs-on: ubuntu-latest
 
         strategy:
             fail-fast: false
             matrix:
-                php-version:
-                    - '7.1'
-                    - '7.2'
-                    - '7.3'
-                    - '7.4'
-                    - '8.0'
-                    - '8.1'
-                dependencies:
-                    - 'highest'
                 include:
-                    - php-version: '7.1'
-                      dependencies: 'lowest'
+                  - php: '7.1'
+                  - php: '7.2'
+                  - php: '7.3'
+                  - php: '7.4'
+                  - php: '8.0'
+                  - php: '8.1'
+                  - php: '7.4'
+                    mode: low-deps
 
         steps:
             - name: "Checkout code"
@@ -39,37 +36,37 @@ jobs:
               uses: shivammathur/setup-php@2.7.0
               with:
                   coverage: "none"
-                  php-version: ${{ matrix.php-version }}
+                  php-version: ${{ matrix.php }}
                   tools: composer:v2
 
             - name: "Validate composer.json"
               run: "composer validate --strict --no-check-lock"
 
-            - name: "Add PHPUnit matcher"
-              run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
+            - run: |
+                composer require --no-update composer/composer:^1.0.2 --ansi
 
-            - run: composer require --no-update composer/composer:^1.0.2
-
-            - uses: "ramsey/composer-install@v1"
-              with:
-                  dependency-versions: "${{ matrix.dependencies }}"
+                if [[ "${{ matrix.mode }}" = low-deps ]]; then
+                    composer u --prefer-lowest --prefer-stable --ansi
+                else
+                    composer u --ansi
+                fi
 
             - name: "Install PHPUnit"
               run: vendor/bin/simple-phpunit install
 
-            - name: "PHPUnit version"
-              run: vendor/bin/simple-phpunit --version
-
             - run: vendor/bin/simple-phpunit
 
-            - run: composer require --no-update composer/composer:^2
+            - run: |
+                composer require --no-update composer/composer:^2 --ansi
 
-            - uses: "ramsey/composer-install@v1"
-              with:
-                  dependency-versions: "${{ matrix.dependencies }}"
+                if [[ "${{ matrix.mode }}" = low-deps ]]; then
+                    composer u --prefer-lowest --prefer-stable --ansi
+                else
+                    composer u --ansi
+                fi
 
             - run: vendor/bin/simple-phpunit
 
-            - if: matrix.php-version == '7.1'
+            - if: matrix.php == '7.1'
               name: "Lint PHP files"
               run: find src/ -name '*.php' | xargs -n1 php -l
diff --git a/composer.json b/composer.json
@@ -18,7 +18,7 @@
         "composer/composer": "^1.0.2|^2.0",
         "symfony/dotenv": "^4.4|^5.0",
         "symfony/filesystem": "^4.4|^5.0",
-        "symfony/phpunit-bridge": "^4.4|^5.0",
+        "symfony/phpunit-bridge": "^4.4.12|^5.0",
         "symfony/process": "^3.4|^4.4|^5.0"
     },
     "autoload": {
diff --git a/tests/Configurator/CopyDirectoryFromPackageConfiguratorTest.php b/tests/Configurator/CopyDirectoryFromPackageConfiguratorTest.php
@@ -44,7 +44,7 @@ public function testConfigureDirectory()
         }
 
         foreach ($this->targetFiles as $targetFile) {
-            $this->assertFileNotExists($targetFile);
+            $this->assertFileDoesNotExist($targetFile);
         }
         $lock = $this->getMockBuilder(Lock::class)->disableOriginalConstructor()->getMock();
         $this->createConfigurator()->configure($this->recipe, [
diff --git a/tests/Configurator/CopyFromPackageConfiguratorTest.php b/tests/Configurator/CopyFromPackageConfiguratorTest.php
@@ -94,7 +94,7 @@ public function testConfigure()
         $this->io->expects($this->at(1))->method('writeError')->with(['      Created <fg=green>"./public/"</>']);
         $this->io->expects($this->at(2))->method('writeError')->with(['      Created <fg=green>"./public/file"</>']);
 
-        $this->assertFileNotExists($this->targetFile);
+        $this->assertFileDoesNotExist($this->targetFile);
         $lock = $this->getMockBuilder(Lock::class)->disableOriginalConstructor()->getMock();
         $this->createConfigurator()->configure($this->recipe, [$this->sourceFileRelativePath => $this->targetFileRelativePath], $lock);
         $this->assertFileExists($this->targetFile);
@@ -112,12 +112,12 @@ public function testUnconfigure()
         $this->assertFileExists($this->targetFile);
         $lock = $this->getMockBuilder(Lock::class)->disableOriginalConstructor()->getMock();
         $this->createConfigurator()->unconfigure($this->recipe, [$this->sourceFileRelativePath => $this->targetFileRelativePath], $lock);
-        $this->assertFileNotExists($this->targetFile);
+        $this->assertFileDoesNotExist($this->targetFile);
     }
 
     public function testNoFilesRemoved()
     {
-        $this->assertFileNotExists($this->targetFile);
+        $this->assertFileDoesNotExist($this->targetFile);
         $this->io->expects($this->exactly(1))->method('writeError')->with(['    Removing files from package']);
         $lock = $this->getMockBuilder(Lock::class)->disableOriginalConstructor()->getMock();
         $this->createConfigurator()->unconfigure($this->recipe, [$this->sourceFileRelativePath => $this->targetFileRelativePath], $lock);
diff --git a/tests/Configurator/CopyFromRecipeConfiguratorTest.php b/tests/Configurator/CopyFromRecipeConfiguratorTest.php
@@ -85,7 +85,7 @@ public function testConfigure()
         $this->io->expects($this->at(0))->method('writeError')->with(['    Copying files from recipe']);
         $this->io->expects($this->at(1))->method('writeError')->with(['      Created <fg=green>"./config/file"</>']);
 
-        $this->assertFileNotExists($this->targetFile);
+        $this->assertFileDoesNotExist($this->targetFile);
         $lock = $this->getMockBuilder(Lock::class)->disableOriginalConstructor()->getMock();
         $this->createConfigurator()->configure(
             $this->recipe,
@@ -123,12 +123,12 @@ public function testUnconfigure()
         $this->assertFileExists($this->targetFile);
         $lock = $this->getMockBuilder(Lock::class)->disableOriginalConstructor()->getMock();
         $this->createConfigurator()->unconfigure($this->recipe, [$this->targetFileRelativePath], $lock);
-        $this->assertFileNotExists($this->targetFile);
+        $this->assertFileDoesNotExist($this->targetFile);
     }
 
     public function testNoFilesRemoved()
     {
-        $this->assertFileNotExists($this->targetFile);
+        $this->assertFileDoesNotExist($this->targetFile);
         $this->io->expects($this->exactly(1))->method('writeError')->with(['    Removing files from recipe']);
         $lock = $this->getMockBuilder(Lock::class)->disableOriginalConstructor()->getMock();
         $this->createConfigurator()->unconfigure($this->recipe, [$this->sourceFileRelativePath => $this->targetFileRelativePath], $lock);
diff --git a/tests/Configurator/EnvConfiguratorTest.php b/tests/Configurator/EnvConfiguratorTest.php
@@ -181,19 +181,19 @@ public function testConfigureGeneratedSecret()
         ], $lock);
 
         $envContents = file_get_contents($env);
-        $this->assertRegExp('/#TRUSTED_SECRET_1=[a-z0-9]{64}/', $envContents);
-        $this->assertRegExp('/#TRUSTED_SECRET_2=[a-z0-9]{64}/', $envContents);
-        $this->assertRegExp('/#TRUSTED_SECRET_3=[a-z0-9]{64}/', $envContents);
-        $this->assertRegExp('/APP_SECRET=[a-z0-9]{32}/', $envContents);
+        $this->assertMatchesRegularExpression('/#TRUSTED_SECRET_1=[a-z0-9]{64}/', $envContents);
+        $this->assertMatchesRegularExpression('/#TRUSTED_SECRET_2=[a-z0-9]{64}/', $envContents);
+        $this->assertMatchesRegularExpression('/#TRUSTED_SECRET_3=[a-z0-9]{64}/', $envContents);
+        $this->assertMatchesRegularExpression('/APP_SECRET=[a-z0-9]{32}/', $envContents);
         @unlink($env);
 
         foreach ([$phpunitDist, $phpunit] as $file) {
             $fileContents = file_get_contents($file);
 
-            $this->assertRegExp('/<!-- env name="TRUSTED_SECRET_1" value="[a-z0-9]{64}" -->/', $fileContents);
-            $this->assertRegExp('/<!-- env name="TRUSTED_SECRET_2" value="[a-z0-9]{64}" -->/', $fileContents);
-            $this->assertRegExp('/<!-- env name="TRUSTED_SECRET_3" value="[a-z0-9]{64}" -->/', $fileContents);
-            $this->assertRegExp('/<env name="APP_SECRET" value="[a-z0-9]{32}"\/>/', $fileContents);
+            $this->assertMatchesRegularExpression('/<!-- env name="TRUSTED_SECRET_1" value="[a-z0-9]{64}" -->/', $fileContents);
+            $this->assertMatchesRegularExpression('/<!-- env name="TRUSTED_SECRET_2" value="[a-z0-9]{64}" -->/', $fileContents);
+            $this->assertMatchesRegularExpression('/<!-- env name="TRUSTED_SECRET_3" value="[a-z0-9]{64}" -->/', $fileContents);
+            $this->assertMatchesRegularExpression('/<env name="APP_SECRET" value="[a-z0-9]{32}"\/>/', $fileContents);
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public function testConfigureDirectory()`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`foreach ($this->targetFiles as $targetFile) {`
`47`		`- $this->assertFileNotExists($targetFile);`
	`47`	`+ $this->assertFileDoesNotExist($targetFile);`
`48`	`48`	`}`
`49`	`49`	`$lock = $this->getMockBuilder(Lock::class)->disableOriginalConstructor()->getMock();`
`50`	`50`	`$this->createConfigurator()->configure($this->recipe, [`