adds windows-latest to github action tests and corrects PHP_EOL to \n, bumped actions to v4 to avoid warnings

marcing · marcing · commit 8d837a6ebff5 · 2024-02-02T15:20:40.000+01:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -11,19 +11,20 @@ on:
 jobs:
 
     tests:
-        name: Tests - PHP ${{ matrix.php }} ${{ matrix.dependency-version }}
-        runs-on: ubuntu-latest
+        name: Tests ${{ matrix.os }} - PHP ${{ matrix.php }}
         timeout-minutes: 15
         strategy:
             matrix:
+                os: [ubuntu-latest, windows-latest]
                 php: [ '8.0', '8.1', '8.2', '8.3' ]
-                dependency-version: [ '' ]
-                include:
-                    -   php: '8.0'
-                        dependency-version: '--prefer-lowest'
+        runs-on: ${{ matrix.os }}        
         steps:
+            -   name: Set git to use LF
+                run: |
+                    git config --global core.autocrlf input
+                    git config --global core.eol lf
             -   name: Checkout
-                uses: actions/checkout@v2
+                uses: actions/checkout@v4
             -   name: Setup PHP
                 uses: shivammathur/setup-php@v2
                 with:
@@ -32,19 +33,15 @@ jobs:
                     coverage: none
                     # Enable apcu
                     extensions: apcu
-                    ini-values: apc.enable_cli=1
+                    ini-values: apc.enable_cli=1, opcache.enable=1, opcache.jit=tracing, opcache.jit_buffer_size=128M
             -   name: Cache Composer dependencies
-                uses: actions/cache@v2
+                uses: actions/cache@v4
                 with:
                     path: ~/.composer/cache
                     key: php-${{ matrix.php }}-composer-locked-${{ hashFiles('composer.lock') }}
                     restore-keys: php-${{ matrix.php }}-composer-locked-
             -   name: Install PHP dependencies
-                if: matrix.php != '8.1'
-                run: composer update ${{ matrix.dependency-version }} --prefer-dist --no-interaction --no-progress --no-suggest
-            -   name: 'Install PHP dependencies on PHP 8.1 (TODO: remove that)'
-                if: matrix.php == '8.1'
-                run: composer update --ignore-platform-reqs ${{ matrix.dependency-version }} --prefer-dist --no-interaction --no-progress --no-suggest
+                run: composer update ${{ matrix.dependency-version }} --prefer-dist --no-interaction --no-progress
             -   name: PHPUnit
                 run: vendor/bin/phpunit
 
@@ -53,15 +50,15 @@ jobs:
         runs-on: ubuntu-latest
         steps:
             -   name: Checkout
-                uses: actions/checkout@v2
+                uses: actions/checkout@v4
             -   name: Setup PHP
                 uses: shivammathur/setup-php@v2
                 with:
-                    php-version: 8.0
+                    php-version: 8.3
                     tools: composer:v2, cs2pr
                     coverage: none
             -   name: Cache Composer dependencies
-                uses: actions/cache@v2
+                uses: actions/cache@v4
                 with:
                     path: ~/.composer/cache
                     key: php-composer-locked-${{ hashFiles('composer.lock') }}
@@ -75,15 +72,15 @@ jobs:
         runs-on: ubuntu-latest
         steps:
             -   name: Checkout
-                uses: actions/checkout@v2
+                uses: actions/checkout@v4
             -   name: Setup PHP
                 uses: shivammathur/setup-php@v2
                 with:
-                    php-version: 8.0
+                    php-version: 8.3
                     tools: composer:v2, cs2pr
                     coverage: none
             -   name: Cache Composer dependencies
-                uses: actions/cache@v2
+                uses: actions/cache@v4
                 with:
                     path: ~/.composer/cache
                     key: php-composer-locked-${{ hashFiles('composer.lock') }}
diff --git a/src/Definition/ArrayDefinition.php b/src/Definition/ArrayDefinition.php
@@ -42,7 +42,7 @@ public function replaceNestedDefinitions(callable $replacer) : void
 
     public function __toString() : string
     {
-        $str = '[' . \PHP_EOL;
+        $str = '[' . "\n";
 
         foreach ($this->values as $key => $value) {
             if (is_string($key)) {
@@ -52,12 +52,12 @@ public function __toString() : string
             $str .= '    ' . $key . ' => ';
 
             if ($value instanceof Definition) {
-                $str .= str_replace(\PHP_EOL, \PHP_EOL . '    ', (string) $value);
+                $str .= str_replace("\n", "\n" . '    ', (string) $value);
             } else {
                 $str .= var_export($value, true);
             }
 
-            $str .= ',' . \PHP_EOL;
+            $str .= ',' . "\n";
         }
 
         return $str . ']';
diff --git a/src/Definition/Dumper/ObjectDefinitionDumper.php b/src/Definition/Dumper/ObjectDefinitionDumper.php
@@ -35,7 +35,7 @@ public function dump(ObjectDefinition $definition) : string
         $str = sprintf('    class = %s%s', $warning, $className);
 
         // Lazy
-        $str .= \PHP_EOL . '    lazy = ' . var_export($definition->isLazy(), true);
+        $str .= "\n" . '    lazy = ' . var_export($definition->isLazy(), true);
 
         if ($classExist) {
             // Constructor
@@ -48,7 +48,7 @@ public function dump(ObjectDefinition $definition) : string
             $str .= $this->dumpMethods($className, $definition);
         }
 
-        return sprintf('Object (' . \PHP_EOL . '%s' . \PHP_EOL . ')', $str);
+        return sprintf('Object (' . "\n" . '%s' . "\n" . ')', $str);
     }
 
     /**
@@ -63,7 +63,7 @@ private function dumpConstructor(string $className, ObjectDefinition $definition
         if ($constructorInjection !== null) {
             $parameters = $this->dumpMethodParameters($className, $constructorInjection);
 
-            $str .= sprintf(\PHP_EOL . '    __construct(' . \PHP_EOL . '        %s' . \PHP_EOL . '    )', $parameters);
+            $str .= sprintf("\n" . '    __construct(' . "\n" . '        %s' . "\n" . '    )', $parameters);
         }
 
         return $str;
@@ -77,7 +77,7 @@ private function dumpProperties(ObjectDefinition $definition) : string
             $value = $propertyInjection->getValue();
             $valueStr = $value instanceof Definition ? (string) $value : var_export($value, true);
 
-            $str .= sprintf(\PHP_EOL . '    $%s = %s', $propertyInjection->getPropertyName(), $valueStr);
+            $str .= sprintf("\n" . '    $%s = %s', $propertyInjection->getPropertyName(), $valueStr);
         }
 
         return $str;
@@ -93,7 +93,7 @@ private function dumpMethods(string $className, ObjectDefinition $definition) :
         foreach ($definition->getMethodInjections() as $methodInjection) {
             $parameters = $this->dumpMethodParameters($className, $methodInjection);
 
-            $str .= sprintf(\PHP_EOL . '    %s(' . \PHP_EOL . '        %s' . \PHP_EOL . '    )', $methodInjection->getMethodName(), $parameters);
+            $str .= sprintf("\n" . '    %s(' . "\n" . '        %s' . "\n" . '    )', $methodInjection->getMethodName(), $parameters);
         }
 
         return $str;
@@ -139,6 +139,6 @@ private function dumpMethodParameters(string $className, MethodInjection $method
             $args[] = sprintf('$%s = #UNDEFINED#', $parameter->getName());
         }
 
-        return implode(\PHP_EOL . '        ', $args);
+        return implode("\n" . '        ', $args);
     }
 }
diff --git a/src/Definition/EnvironmentVariableDefinition.php b/src/Definition/EnvironmentVariableDefinition.php
@@ -68,20 +68,20 @@ public function replaceNestedDefinitions(callable $replacer) : void
 
     public function __toString() : string
     {
-        $str = '    variable = ' . $this->variableName . \PHP_EOL
+        $str = '    variable = ' . $this->variableName . "\n"
             . '    optional = ' . ($this->isOptional ? 'yes' : 'no');
 
         if ($this->isOptional) {
             if ($this->defaultValue instanceof Definition) {
                 $nestedDefinition = (string) $this->defaultValue;
-                $defaultValueStr = str_replace(\PHP_EOL, \PHP_EOL . '    ', $nestedDefinition);
+                $defaultValueStr = str_replace("\n", "\n" . '    ', $nestedDefinition);
             } else {
                 $defaultValueStr = var_export($this->defaultValue, true);
             }
 
-            $str .= \PHP_EOL . '    default = ' . $defaultValueStr;
+            $str .= "\n" . '    default = ' . $defaultValueStr;
         }
 
-        return sprintf('Environment variable (' . \PHP_EOL . '%s' . \PHP_EOL . ')', $str);
+        return sprintf('Environment variable (' . "\n" . '%s' . "\n" . ')', $str);
     }
 }
diff --git a/src/Definition/Exception/InvalidDefinition.php b/src/Definition/Exception/InvalidDefinition.php
@@ -17,7 +17,7 @@ class InvalidDefinition extends \Exception implements ContainerExceptionInterfac
     public static function create(Definition $definition, string $message, \Exception $previous = null) : self
     {
         return new self(sprintf(
-            '%s' . \PHP_EOL . 'Full definition:' . \PHP_EOL . '%s',
+            '%s' . "\n" . 'Full definition:' . "\n" . '%s',
             $message,
             (string) $definition
         ), 0, $previous);

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public function replaceNestedDefinitions(callable $replacer) : void`
`42`	`42`
`43`	`43`	`public function __toString() : string`
`44`	`44`	`{`
`45`		`- $str = '[' . \PHP_EOL;`
	`45`	`+ $str = '[' . "\n";`
`46`	`46`
`47`	`47`	`foreach ($this->values as $key => $value) {`
`48`	`48`	`if (is_string($key)) {`
`@@ -52,12 +52,12 @@ public function __toString() : string`
`52`	`52`	`$str .= ' ' . $key . ' => ';`
`53`	`53`
`54`	`54`	`if ($value instanceof Definition) {`
`55`		`- $str .= str_replace(\PHP_EOL, \PHP_EOL . ' ', (string) $value);`
	`55`	`+ $str .= str_replace("\n", "\n" . ' ', (string) $value);`
`56`	`56`	`} else {`
`57`	`57`	`$str .= var_export($value, true);`
`58`	`58`	`}`
`59`	`59`
`60`		`- $str .= ',' . \PHP_EOL;`
	`60`	`+ $str .= ',' . "\n";`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`return $str . ']';`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public function dump(ObjectDefinition $definition) : string`
`35`	`35`	`$str = sprintf(' class = %s%s', $warning, $className);`
`36`	`36`
`37`	`37`	`// Lazy`
`38`		`- $str .= \PHP_EOL . ' lazy = ' . var_export($definition->isLazy(), true);`
	`38`	`+ $str .= "\n" . ' lazy = ' . var_export($definition->isLazy(), true);`
`39`	`39`
`40`	`40`	`if ($classExist) {`
`41`	`41`	`// Constructor`
`@@ -48,7 +48,7 @@ public function dump(ObjectDefinition $definition) : string`
`48`	`48`	`$str .= $this->dumpMethods($className, $definition);`
`49`	`49`	`}`
`50`	`50`
`51`		`- return sprintf('Object (' . \PHP_EOL . '%s' . \PHP_EOL . ')', $str);`
	`51`	`+ return sprintf('Object (' . "\n" . '%s' . "\n" . ')', $str);`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`/**`
`@@ -63,7 +63,7 @@ private function dumpConstructor(string $className, ObjectDefinition $definition`
`63`	`63`	`if ($constructorInjection !== null) {`
`64`	`64`	`$parameters = $this->dumpMethodParameters($className, $constructorInjection);`
`65`	`65`
`66`		`- $str .= sprintf(\PHP_EOL . ' __construct(' . \PHP_EOL . ' %s' . \PHP_EOL . ' )', $parameters);`
	`66`	`+ $str .= sprintf("\n" . ' __construct(' . "\n" . ' %s' . "\n" . ' )', $parameters);`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`return $str;`
`@@ -77,7 +77,7 @@ private function dumpProperties(ObjectDefinition $definition) : string`
`77`	`77`	`$value = $propertyInjection->getValue();`
`78`	`78`	`$valueStr = $value instanceof Definition ? (string) $value : var_export($value, true);`
`79`	`79`
`80`		`- $str .= sprintf(\PHP_EOL . ' $%s = %s', $propertyInjection->getPropertyName(), $valueStr);`
	`80`	`+ $str .= sprintf("\n" . ' $%s = %s', $propertyInjection->getPropertyName(), $valueStr);`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`return $str;`
`@@ -93,7 +93,7 @@ private function dumpMethods(string $className, ObjectDefinition $definition) :`
`93`	`93`	`foreach ($definition->getMethodInjections() as $methodInjection) {`
`94`	`94`	`$parameters = $this->dumpMethodParameters($className, $methodInjection);`
`95`	`95`
`96`		`- $str .= sprintf(\PHP_EOL . ' %s(' . \PHP_EOL . ' %s' . \PHP_EOL . ' )', $methodInjection->getMethodName(), $parameters);`
	`96`	`+ $str .= sprintf("\n" . ' %s(' . "\n" . ' %s' . "\n" . ' )', $methodInjection->getMethodName(), $parameters);`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`return $str;`
`@@ -139,6 +139,6 @@ private function dumpMethodParameters(string $className, MethodInjection $method`
`139`	`139`	`$args[] = sprintf('$%s = #UNDEFINED#', $parameter->getName());`
`140`	`140`	`}`
`141`	`141`
`142`		`- return implode(\PHP_EOL . ' ', $args);`
	`142`	`+ return implode("\n" . ' ', $args);`
`143`	`143`	`}`
`144`	`144`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,20 +68,20 @@ public function replaceNestedDefinitions(callable $replacer) : void`
`68`	`68`
`69`	`69`	`public function __toString() : string`
`70`	`70`	`{`
`71`		`- $str = ' variable = ' . $this->variableName . \PHP_EOL`
	`71`	`+ $str = ' variable = ' . $this->variableName . "\n"`
`72`	`72`	`. ' optional = ' . ($this->isOptional ? 'yes' : 'no');`
`73`	`73`
`74`	`74`	`if ($this->isOptional) {`
`75`	`75`	`if ($this->defaultValue instanceof Definition) {`
`76`	`76`	`$nestedDefinition = (string) $this->defaultValue;`
`77`		`- $defaultValueStr = str_replace(\PHP_EOL, \PHP_EOL . ' ', $nestedDefinition);`
	`77`	`+ $defaultValueStr = str_replace("\n", "\n" . ' ', $nestedDefinition);`
`78`	`78`	`} else {`
`79`	`79`	`$defaultValueStr = var_export($this->defaultValue, true);`
`80`	`80`	`}`
`81`	`81`
`82`		`- $str .= \PHP_EOL . ' default = ' . $defaultValueStr;`
	`82`	`+ $str .= "\n" . ' default = ' . $defaultValueStr;`
`83`	`83`	`}`
`84`	`84`
`85`		`- return sprintf('Environment variable (' . \PHP_EOL . '%s' . \PHP_EOL . ')', $str);`
	`85`	`+ return sprintf('Environment variable (' . "\n" . '%s' . "\n" . ')', $str);`
`86`	`86`	`}`
`87`	`87`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ class InvalidDefinition extends \Exception implements ContainerExceptionInterfac`
`17`	`17`	`public static function create(Definition $definition, string $message, \Exception $previous = null) : self`
`18`	`18`	`{`
`19`	`19`	`return new self(sprintf(`
`20`		`- '%s' . \PHP_EOL . 'Full definition:' . \PHP_EOL . '%s',`
	`20`	`+ '%s' . "\n" . 'Full definition:' . "\n" . '%s',`
`21`	`21`	`$message,`
`22`	`22`	`(string) $definition`
`23`	`23`	`), 0, $previous);`