Merge pull request #168 from php-etl/fix/job-code-and-cloud-configuration

Made  the step code mandatory to avoid problems

Author: gplanchat

.github/workflows/infection.yaml

@@ -4,7 +4,7 @@ jobs:
     infection:
         runs-on: ubuntu-latest
         steps:
-            -   uses: actions/checkout@v3
+            -   uses: actions/checkout@v4
             -   uses: shivammathur/setup-php@v2
                 with:
                     php-version: '8.2'
@@ -29,6 +29,6 @@ jobs:
                     ./infection.phar
 
             -   name: Store infection log
-                uses: actions/upload-artifact@v3
+                uses: actions/upload-artifact@v4
                 with:
                     path: infection.log

.github/workflows/phpstan-5.yaml

@@ -4,8 +4,8 @@ jobs:
   phpstan5:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/cache@v3
+      - uses: actions/checkout@v4
+      - uses: actions/cache@v4
         with:
           path: '**/vendor'
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}

.github/workflows/phpstan-6.yaml

@@ -4,8 +4,8 @@ jobs:
   phpstan6:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/cache@v3
+      - uses: actions/checkout@v4
+      - uses: actions/cache@v4
         with:
           path: '**/vendor'
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}

.github/workflows/phpstan-7.yaml

@@ -4,8 +4,8 @@ jobs:
   phpstan7:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/cache@v3
+      - uses: actions/checkout@v4
+      - uses: actions/cache@v4
         with:
           path: '**/vendor'
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}

.github/workflows/phpstan-8.yaml

@@ -4,8 +4,8 @@ jobs:
   phpstan8:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/cache@v3
+      - uses: actions/checkout@v4
+      - uses: actions/cache@v4
         with:
           path: '**/vendor'
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}

.github/workflows/phpunit.yaml

@@ -4,7 +4,7 @@ jobs:
     phpunit:
         runs-on: ubuntu-latest
         steps:
-            -   uses: actions/checkout@v3
+            -   uses: actions/checkout@v4
             -   uses: shivammathur/setup-php@v2
                 with:
                     php-version: '8.2'
@@ -25,6 +25,6 @@ jobs:
                 run: bin/phpunit --coverage-html var/coverage
 
             -   name: Store coverage files
-                uses: actions/upload-artifact@v3
+                uses: actions/upload-artifact@v4
                 with:
                     path: var/coverage

.github/workflows/quality.yaml

@@ -4,7 +4,7 @@ jobs:
     cs-fixer:
         runs-on: ubuntu-latest
         steps:
-            -   uses: actions/checkout@v3
+            -   uses: actions/checkout@v4
             -   uses: shivammathur/setup-php@v2
                 with:
                     php-version: '8.2'
@@ -19,8 +19,8 @@ jobs:
     phpstan:
         runs-on: ubuntu-latest
         steps:
-            -   uses: actions/checkout@v3
-            -   uses: actions/cache@v3
+            -   uses: actions/checkout@v4
+            -   uses: actions/cache@v4
                 with:
                     path: '**/vendor'
                     key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}

.github/workflows/rector.yaml

@@ -11,7 +11,7 @@ jobs:
         steps:
             -
                 if: github.event.pull_request.head.repo.full_name == github.repository
-                uses: actions/checkout@v3
+                uses: actions/checkout@v4
 
             -
                 uses: shivammathur/setup-php@v2

src/Cloud/Workflow.php

@@ -34,10 +34,9 @@ public static function fromLegacyConfiguration(array $configuration): DTO\Workfl
             $configuration['code'] ?? sprintf('workflow%s', $random),
             new DTO\JobList(
                 ...array_map(
-                    function (array $config, int $order) {
+                    function (string $code, array $config, int $order) {
                         if (\array_key_exists('pipeline', $config)) {
                             $name = $config['pipeline']['name'] ?? sprintf('pipeline%d', $order);
-                            $code = $config['pipeline']['code'] ?? sprintf('pipeline%d', $order);
                             unset($config['pipeline']['name'], $config['pipeline']['code']);
 
                             array_walk_recursive($config, function (&$value): void {
@@ -50,13 +49,14 @@ function (array $config, int $order) {
                                 $name,
                                 new JobCode($code),
                                 new StepList(
-                                    ...array_map(fn (array $step, int $order) => new Step(
+                                    ...array_map(fn(string $code, array $step, int $order) => new Step(
                                         $step['name'] ?? sprintf('step%d', $order),
-                                        new StepCode($step['code'] ?? sprintf('step%d', $order)),
+                                        new StepCode($code ?? sprintf('step%d', $order)),
                                         $step,
                                         new ProbeList(),
                                         $order
                                     ),
+                                        array_keys($config['pipeline']['steps']),
                                         $config['pipeline']['steps'],
                                         range(0, (is_countable($config['pipeline']['steps']) ? \count($config['pipeline']['steps']) : 0) - 1)
                                     ),
@@ -67,7 +67,6 @@ function (array $config, int $order) {
 
                         if (\array_key_exists('action', $config)) {
                             $name = $config['action']['name'] ?? sprintf('action%d', $order);
-                            $code = $config['action']['code'] ?? sprintf('action%d', $order);
                             unset($config['action']['name'], $config['action']['code']);
 
                             array_walk_recursive($config, function (&$value): void {
@@ -90,8 +89,9 @@ function (array $config, int $order) {
 
                         throw new \RuntimeException('This type is currently not supported.');
                     },
+                    array_keys($configuration['workflow']['jobs']),
                     $configuration['workflow']['jobs'],
-                    range(0, (is_countable($configuration['workflow']['jobs']) ? \count($configuration['workflow']['jobs']) : 0) - 1)
+                    range(0, (is_countable($configuration['workflow']['jobs']) ? \count($configuration['workflow']['jobs']) : 0) - 1),
                 )
             ),
             new Composer(

src/Runtime/Pipeline/Configuration.php

@@ -44,6 +44,7 @@ public function getStepsTreeBuilder(): TreeBuilder
 
         /* @phpstan-ignore-next-line */
         $builder->getRootNode()
+            ->useAttributeAsKey('code')
             ->requiresAtLeastOneElement()
             ->cannotBeEmpty()
             ->isRequired()