Merge branch 'release/2.0.0-beta3'

php-tuf · Aug 30, 2023 · 9dd34d0 · 9dd34d0
2 parents c64f5f4 + 9854901
commit 9dd34d0
Show file tree

Hide file tree

Showing 231 changed files with 2,558 additions and 1,772 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -14,4 +14,5 @@
 /psalm.xml.dist      export-ignore
 /rector.php          export-ignore
 /tests               export-ignore
+/tools               export-ignore
 /var                 export-ignore
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -3,12 +3,16 @@
 version: 2
 updates:
 
-    - package-ecosystem: "github-actions"
+    - package-ecosystem: "composer"
       directory: "/"
       schedule:
           interval: "weekly"
+      groups:
+          all:
+              patterns:
+                  - "*"
 
-    - package-ecosystem: "composer"
+    - package-ecosystem: "github-actions"
       directory: "/"
       schedule:
-          interval: "daily"
+          interval: "weekly"
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -19,7 +19,7 @@ on:
 
 jobs:
     static_analysis:
-        name: "Static Analysis: ubuntu-latest"
+        name: "Static Analysis"
         runs-on: ubuntu-latest
         steps:
             -   name: "Set up PHP"
@@ -37,6 +37,26 @@ jobs:
             -   name: "Run all static analysis tools"
                 run: "composer static"
 
+    testdox:
+        name: "TestDox"
+        runs-on: ubuntu-latest
+        steps:
+            -   name: "Set up PHP"
+                uses: shivammathur/setup-php@v2 # https://github.com/marketplace/actions/setup-php-action
+                with:
+                    php-version: "8.1"
+                    ini-values: assert.active=1, assert.exception=1, zend.assertions=1
+                    coverage: none
+
+            -   name: "Checkout code"
+                uses: actions/checkout@v3 # https://github.com/marketplace/actions/checkout
+
+            -   name: "Install dependencies"
+                uses: ramsey/composer-install@v2 # https://github.com/marketplace/actions/install-composer-dependencies
+
+            -   name: "Run tests with TestDox"
+                run: "composer dox"
+
     tests:
         name: "Test: ${{ matrix.os }} / deps-${{ matrix.dependencies }}"
         runs-on: "${{ matrix.os }}"
@@ -91,7 +111,7 @@ jobs:
                 if: ${{ runner.os == 'Windows' }}
 
     performance:
-        name: "Performance: ubuntu-latest"
+        name: "Performance"
         runs-on: ubuntu-latest
         steps:
             -   name: "Set up PHP"

diff --git a/.gitignore b/.gitignore
@@ -6,8 +6,8 @@
 /phpcs.xml
 /phpunit.xml
 /psalm.xml
-/tests/PHPUnit/Exploratory/*
-!/tests/PHPUnit/Exploratory/ExploratoryTestTemplate.php
+/tests/Exploratory/*
+!/tests/Exploratory/ExploratoryTestTemplate.php
 /var/*/*
 /vendor/
 !/**/.gitkeep
diff --git a/.idea/composer-stager.iml b/.idea/composer-stager.iml
diff --git a/.idea/dictionaries/project.xml b/.idea/dictionaries/project.xml
diff --git a/.idea/runConfigurations/End_to_End_Test.xml b/.idea/runConfigurations/End_to_End_Test.xml
diff --git a/.idea/scopes/Source_Files.xml b/.idea/scopes/Source_Files.xml
diff --git a/composer.json b/composer.json
@@ -19,8 +19,8 @@
     "require": {
         "php": ">=8.1.0",
         "ext-json": "*",
-        "symfony/filesystem": "^6.3",
-        "symfony/process": "^6.3",
+        "symfony/filesystem": "^6.2",
+        "symfony/process": "^6.2",
         "symfony/translation-contracts": "^3.2"
     },
     "require-dev": {
@@ -39,7 +39,7 @@
         "phpstan/phpstan-strict-rules": "^1.5",
         "phpunit/phpunit": "^9.6",
         "psalm/phar": "^5.13",
-        "rector/rector": "^0.17.5",
+        "rector/rector": "^0.17.5 || ^0.18.0",
         "slevomat/coding-standard": "^8.13",
         "squizlabs/php_codesniffer": "^3.7",
         "symfony/config": "^6.3",
@@ -59,10 +59,10 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "PhpTuf\\ComposerStager\\": "tests/PHPCS/",
-            "PhpTuf\\ComposerStager\\PHPBench\\": "tests/PHPBench/",
-            "PhpTuf\\ComposerStager\\PHPStan\\": "tests/PHPStan/",
-            "PhpTuf\\ComposerStager\\Tests\\": "tests/PHPUnit/"
+            "PhpTuf\\ComposerStager\\": "tools/PHPCS/",
+            "PhpTuf\\ComposerStager\\PHPBench\\": "tools/PHPBench/",
+            "PhpTuf\\ComposerStager\\PHPStan\\": "tools/PHPStan/",
+            "PhpTuf\\ComposerStager\\Tests\\": "tests/"
         }
     },
     "config": {
@@ -98,6 +98,7 @@
         "cbf": "phpcbf",
         "coverage": "open $(pwd)/var/phpunit/html-coverage/index.html || echo 'Run the \"test\" command to generate the coverage report.'",
         "cs": "@phpcs",
+        "dox": "phpunit --testdox --color=always --exclude-group=windows_only",
         "fast": "phpunit --exclude-group=slow,windows_only",
         "fix": "@phpcbf",
         "functional": "phpunit --testsuite=functional --exclude-group=windows_only",
@@ -128,6 +129,7 @@
         "cbf": "[phpcbf] Automatically fixes standards violations where possible",
         "coverage": "Opens the code coverage report generated by the \"test\" script (on macOS)",
         "cs": "[phpcs] Checks code for standards compliance",
+        "dox": "Runs tests with TestDox output",
         "fast": "Runs only fast automated tests",
         "fix": "[phpcbf] Automatically fixes standards violations where possible",
         "functional": "Runs functional tests",