Update composer dependencies (#2453)

As well rename test dir to tests, as Pest does not support dir without s on the end.
Also, remove PHP requirement from composer.json as we already have check-in bin/dep and it's better to have the check only in one place (now they already out of sync).

.github/workflows/test.yml

@@ -43,7 +43,7 @@ jobs:
       continue-on-error: true
 
     - name: Build the docker-compose stack
-      run: cd test/docker && docker-compose build
+      run: cd tests/docker && docker-compose build
 
     - name: Cache Composer packages
       id: composer-cache
@@ -59,4 +59,4 @@ jobs:
       run: composer install --prefer-dist --no-progress
 
     - name: Run E2E test suite
-      run: cd test/docker && docker-compose up --abort-on-container-exit
+      run: cd tests/docker && docker-compose up --abort-on-container-exit

composer.json

@@ -35,16 +35,15 @@
     },
     "scripts": {
         "test": "pest",
-        "test:e2e": "pest --config test/e2e/phpunit-e2e.xml",
+        "test:e2e": "pest --config tests/e2e/phpunit-e2e.xml",
         "phpcs": "phpcs",
         "phpstan": "phpstan analyse -c phpstan.neon",
-        "phpstan:baseline": "phpstan analyse -c phpstan.neon --generate-baseline test/phpstan-baseline.neon"
+        "phpstan:baseline": "phpstan analyse -c phpstan.neon --generate-baseline tests/phpstan-baseline.neon"
     },
     "bin": [
         "bin/dep"
     ],
     "require": {
-        "php": ">=7.2.5",
         "marcj/topsort": "^2.0",
         "psr/http-message": "^1",
         "react/http": "^1",
@@ -54,7 +53,7 @@
         "symfony/yaml": "^5"
     },
     "require-dev": {
-        "pestphp/pest": "^0.3",
+        "pestphp/pest": "^1.0",
         "phpstan/phpstan": "^0.12.53",
         "phpunit/phpunit": "^9.3",
         "slevomat/coding-standard": "^6.4",

phpstan.neon

@@ -1,5 +1,5 @@
 includes:
-    - test/phpstan-baseline.neon
+    - tests/phpstan-baseline.neon
 
 parameters:
     level: 5

phpunit.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="test/bootstrap.php" colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" stopOnError="false" stopOnFailure="false" verbose="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="tests/bootstrap.php" colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" stopOnError="false" stopOnFailure="false" verbose="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
   <coverage includeUncoveredFiles="true">
     <include>
       <directory>src/</directory>
@@ -12,10 +12,10 @@
   </coverage>
   <testsuites>
     <testsuite name="Src">
-      <directory>test/src/</directory>
+      <directory>tests/src/</directory>
     </testsuite>
     <testsuite name="Joy">
-      <directory>test/joy/</directory>
+      <directory>tests/joy/</directory>
     </testsuite>
   </testsuites>
 </phpunit>

src/Component/PharUpdate/Manifest.php

@@ -121,7 +121,7 @@ class Manifest
                 return Comparator::isGreaterThan(
                     $a->getVersion(),
                     $b->getVersion()
-                );
+                ) ? 1 : 0;
             }
         );
 

tests/bootstrap.php

@@ -29,6 +29,16 @@ require_once __DIR__ . '/AbstractTest.php';
 
 // Init repository
 $repository = __REPOSITORY__;
+
+exec("ls -la /home/runner/work/deployer/deployer/", $output);
+echo implode(PHP_EOL, $output);
+
+exec("ls -la /home/runner/work/deployer/deployer/tests", $output);
+echo implode(PHP_EOL, $output);
+
+exec("ls -la /home/runner/work/deployer/deployer/tests/fixtures", $output);
+echo implode(PHP_EOL, $output);
+
 `cd $repository && git init`;
 $branch = trim(`git rev-parse --abbrev-ref HEAD`);
 `cd $repository && git checkout -B $branch 2>&1`;

tests/docker/docker-compose.yml

@@ -10,7 +10,7 @@ services:
         condition: service_healthy
     volumes:
       - ./../../:/project
-    command: "php vendor/bin/pest --config test/e2e/phpunit-e2e.xml"
+    command: "php vendor/bin/pest --config tests/e2e/phpunit-e2e.xml"
     networks:
       - e2e
 #    environment: