Merge pull request #154 from ergebnis/dependabot/composer/ergebnis/te…

…st-util-1.0.0
ergebnis · Mar 17, 2020 · c31e6f7 · c31e6f7
2 parents d794283 + cf5efc8
commit c31e6f7
Show file tree

Hide file tree

Showing 9 changed files with 129 additions and 74 deletions.
diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml
@@ -59,6 +59,9 @@ jobs:
           key: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-${{ hashFiles('**/composer.lock') }}"
           restore-keys: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-"
 
+      - name: "Set COMPOSER_ROOT_VERSION environment variable"
+        uses: "docker://ergebnis/composer-root-version-action:0.1.3"
+
       - name: "Install lowest dependencies from composer.json"
         if: "matrix.dependencies == 'lowest'"
         run: "composer update --no-interaction --no-progress --no-suggest --prefer-lowest"
@@ -122,6 +125,9 @@ jobs:
           key: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-${{ hashFiles('**/composer.lock') }}"
           restore-keys: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-"
 
+      - name: "Set COMPOSER_ROOT_VERSION environment variable"
+        uses: "docker://ergebnis/composer-root-version-action:0.1.3"
+
       - name: "Install lowest dependencies from composer.json"
         if: "matrix.dependencies == 'lowest'"
         run: "composer update --no-interaction --no-progress --no-suggest --prefer-lowest"
@@ -172,6 +178,9 @@ jobs:
           key: "${{ matrix.php-version }}-composer-locked-${{ hashFiles('**/composer.lock') }}"
           restore-keys: "${{ matrix.php-version }}-composer-locked-"
 
+      - name: "Set COMPOSER_ROOT_VERSION environment variable"
+        uses: "docker://ergebnis/composer-root-version-action:0.1.3"
+
       - name: "Install lowest dependencies from composer.json"
         if: "matrix.dependencies == 'lowest'"
         run: "composer update --no-interaction --no-progress --no-suggest --prefer-lowest"
@@ -236,6 +245,9 @@ jobs:
           key: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-${{ hashFiles('**/composer.lock') }}"
           restore-keys: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-"
 
+      - name: "Set COMPOSER_ROOT_VERSION environment variable"
+        uses: "docker://ergebnis/composer-root-version-action:0.1.3"
+
       - name: "Install lowest dependencies from composer.json"
         if: "matrix.dependencies == 'lowest'"
         run: "composer update --no-interaction --no-progress --no-suggest --prefer-lowest"
@@ -292,6 +304,9 @@ jobs:
           key: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-${{ hashFiles('**/composer.lock') }}"
           restore-keys: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-"
 
+      - name: "Set COMPOSER_ROOT_VERSION environment variable"
+        uses: "docker://ergebnis/composer-root-version-action:0.1.3"
+
       - name: "Install lowest dependencies from composer.json"
         if: "matrix.dependencies == 'lowest'"
         run: "composer update --no-interaction --no-progress --no-suggest --prefer-lowest"
@@ -350,6 +365,9 @@ jobs:
           key: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-${{ hashFiles('**/composer.lock') }}"
           restore-keys: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-"
 
+      - name: "Set COMPOSER_ROOT_VERSION environment variable"
+        uses: "docker://ergebnis/composer-root-version-action:0.1.3"
+
       - name: "Install lowest dependencies from composer.json"
         if: "matrix.dependencies == 'lowest'"
         run: "composer update --no-interaction --no-progress --no-suggest --prefer-lowest"

diff --git a/.github/workflows/renew.yaml b/.github/workflows/renew.yaml
@@ -48,6 +48,9 @@ jobs:
           key: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-${{ hashFiles('**/composer.lock') }}"
           restore-keys: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-"
 
+      - name: "Set COMPOSER_ROOT_VERSION environment variable"
+        uses: "docker://ergebnis/composer-root-version-action:0.1.3"
+
       - name: "Install lowest dependencies from composer.json"
         if: "matrix.dependencies == 'lowest'"
         run: "composer update --no-interaction --no-progress --no-suggest --prefer-lowest"

diff --git a/composer.json b/composer.json
@@ -27,7 +27,7 @@
     "ergebnis/license": "~0.1.0",
     "ergebnis/php-cs-fixer-config": "^2.1.0",
     "ergebnis/phpstan-rules": "~0.14.4",
-    "ergebnis/test-util": "~0.7.0",
+    "ergebnis/test-util": "~1.0.0",
     "infection/infection": "~0.13.6",
     "phpbench/phpbench": "~0.16.10",
     "phpstan/extension-installer": "^1.0.3",
@@ -46,6 +46,11 @@
     "preferred-install": "dist",
     "sort-packages": true
   },
+  "extra": {
+    "branch-alias": {
+      "dev-master": "1.0-dev"
+    }
+  },
   "autoload": {
     "psr-4": {
       "Ergebnis\\Classy\\": "src/"

diff --git a/composer.lock b/composer.lock
diff --git a/test/AutoReview/SrcCodeTest.php b/test/AutoReview/SrcCodeTest.php
@@ -13,7 +13,7 @@
 
 namespace Ergebnis\Classy\Test\AutoReview;
 
-use Localheinz\Test\Util\Helper;
+use Ergebnis\Test\Util\Helper;
 use PHPUnit\Framework;
 
 /**
@@ -27,7 +27,7 @@ final class SrcCodeTest extends Framework\TestCase
 
     public function testSrcClassesHaveTests(): void
     {
-        $this->assertClassesHaveTests(
+        self::assertClassesHaveTests(
             __DIR__ . '/../../src',
             'Ergebnis\\Classy\\',
             'Ergebnis\\Classy\\Test\\Unit\\'

diff --git a/test/Unit/ConstructTest.php b/test/Unit/ConstructTest.php
@@ -14,7 +14,7 @@
 namespace Ergebnis\Classy\Test\Unit;
 
 use Ergebnis\Classy\Construct;
-use Localheinz\Test\Util\Helper;
+use Ergebnis\Test\Util\Helper;
 use PHPUnit\Framework;
 
 /**
@@ -28,7 +28,7 @@ final class ConstructTest extends Framework\TestCase
 
     public function testFromNameReturnsConstruct(): void
     {
-        $name = $this->faker()->word;
+        $name = self::faker()->word;
 
         $construct = Construct::fromName($name);
 
@@ -38,15 +38,15 @@ public function testFromNameReturnsConstruct(): void
 
     public function testDefaults(): void
     {
-        $construct = Construct::fromName($this->faker()->word);
+        $construct = Construct::fromName(self::faker()->word);
 
         self::assertIsArray($construct->fileNames());
         self::assertCount(0, $construct->fileNames());
     }
 
     public function testToStringReturnsName(): void
     {
-        $name = $this->faker()->word;
+        $name = self::faker()->word;
 
         $construct = Construct::fromName($name);
 
@@ -55,7 +55,7 @@ public function testToStringReturnsName(): void
 
     public function testDefinedInClonesInstanceAndAddsFileNames(): void
     {
-        $faker = $this->faker();
+        $faker = self::faker();
 
         $name = $faker->word;
 

diff --git a/test/Unit/Exception/DirectoryDoesNotExistTest.php b/test/Unit/Exception/DirectoryDoesNotExistTest.php
@@ -15,7 +15,7 @@
 
 use Ergebnis\Classy\Exception\DirectoryDoesNotExist;
 use Ergebnis\Classy\Exception\ExceptionInterface;
-use Localheinz\Test\Util\Helper;
+use Ergebnis\Test\Util\Helper;
 use PHPUnit\Framework;
 
 /**
@@ -29,7 +29,7 @@ final class DirectoryDoesNotExistTest extends Framework\TestCase
 
     public function testFromDirectoryReturnsException(): void
     {
-        $directory = $this->faker()->sentence;
+        $directory = self::faker()->sentence;
 
         $exception = DirectoryDoesNotExist::fromDirectory($directory);