Merge pull request #41 from Elao/github-actions

benji07 · web-flow · commit 10cabeb8aa28 · 2022-02-22T16:43:43.000+01:00
migrate travis to circle-ci
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -0,0 +1,110 @@
+name: CI
+
+on:
+    workflow_dispatch: ~
+    push:
+        branches:
+            - master
+    pull_request: ~
+
+jobs:
+
+    lint:
+        name: Lint
+        runs-on: 'ubuntu-latest'
+        timeout-minutes: 5
+
+        steps:
+            - name: 'Checkout'
+              uses: actions/checkout@v2
+
+            - name: 'Setup PHP'
+              uses: shivammathur/setup-php@v2
+              with:
+                  php-version: '8.1'
+
+            - name: 'Install dependencies'
+              run: make php-cs-fixer.phar
+
+            - name: 'Check style'
+              run: ./php-cs-fixer.phar fix --dry-run --no-interaction --diff
+
+    test:
+        name: ${{ matrix.name }}
+        runs-on: ${{ matrix.os }}
+        timeout-minutes: 8
+        continue-on-error: ${{ matrix.allow-failure == 1 }}
+
+        strategy:
+            fail-fast: false
+            matrix:
+                include:
+                    # Lowest deps
+                    - name: 'Test lowest deps [Linux, PHP 7.4]'
+                      os: 'ubuntu-latest'
+                      php: '7.4'
+                      symfony: '4.4.*@dev'
+                      composer-flags: '--prefer-lowest'
+                      allow-unstable: true
+
+                    # Most recent versions
+                    - name: 'Test Symfony 5.4 [Linux, PHP 8.0]'
+                      os: 'ubuntu-latest'
+                      php: '8.0'
+                      symfony: '5.4.*@dev'
+                      allow-unstable: true
+
+                    - name: 'Test Symfony 6.0 [Linux, PHP 8.1]'
+                      os: 'ubuntu-latest'
+                      php: '8.1'
+                      symfony: '6.0.*@dev'
+                      allow-unstable: true
+
+                    # Bleeding edge (unreleased dev versions where failures are allowed)
+                    - name: 'Test next Symfony [Linux, PHP 8.1] (allowed failure)'
+                      os: 'ubuntu-latest'
+                      php: '8.1'
+                      symfony: '6.1.*@dev'
+                      composer-flags: '--ignore-platform-req php'
+                      allow-unstable: true
+                      allow-failure: true
+
+        steps:
+            - name: 'Set git to use LF'
+              run: |
+                  git config --global core.autocrlf false
+                  git config --global core.eol lf
+
+            - name: 'Checkout'
+              uses: actions/checkout@v2
+
+            - name: 'Setup PHP'
+              uses: shivammathur/setup-php@v2
+              with:
+                  php-version: ${{ matrix.php }}
+                  extensions: pdo_sqlite
+                  coverage: pcov
+                  tools: 'composer:v2,flex'
+
+            - name: 'Get composer cache directory'
+              id: composer-cache
+              run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+
+            - name: 'Cache dependencies'
+              uses: actions/cache@v2
+              with:
+                  path: ${{ steps.composer-cache.outputs.dir }}
+                  key: ${{ runner.os }}-composer-php-${{ matrix.php }}-symfony-${{ matrix.symfony }}-${{ hashFiles('**/composer.json') }}-flags-${{ matrix.composer-flags }}
+                  restore-keys: ${{ runner.os }}-composer-
+
+            - name: 'Allow unstable packages'
+              run: composer config minimum-stability dev
+              if: ${{ matrix.allow-unstable }}
+
+            - name: 'Install dependencies'
+              run: composer update --prefer-dist ${{ matrix.composer-flags }} --ansi
+              env:
+                  SYMFONY_REQUIRE: "${{ matrix.symfony }}"
+
+            - name: 'Run PHPUnit tests'
+              run: vendor/bin/simple-phpunit --testdox --verbose ${{ matrix.code-coverage && '--coverage-text --coverage-clover build/logs/clover.xml' }}
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 /vendor
 composer.lock
-.php_cs.cache
+.php-cs-fixer.cache
+php-cs-fixer.phar
 .phpunit.result.cache
diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php
@@ -14,14 +14,14 @@
     ])
 ;
 
-return PhpCsFixer\Config::create()
+return (new PhpCsFixer\Config())
     ->setRiskyAllowed(true)
     ->setUsingCache(true)
     ->setFinder($finder)
     ->setRules([
         '@Symfony' => true,
         'php_unit_namespaced' => true,
-        'psr0' => false,
+        'psr_autoloading' => true,
         'concat_space' => ['spacing' => 'one'],
         'phpdoc_summary' => false,
         'phpdoc_annotation_without_dot' => false,
@@ -30,7 +30,7 @@
         'ordered_imports' => true,
         'simplified_null_return' => false,
         'header_comment' => ['header' => $header],
-        'yoda_style' => null,
+        'yoda_style' => [],
         'native_function_invocation' => ['include' => ['@compiler_optimized']],
         'single_line_throw' => false,
     ])
diff --git a/.travis.yml b/.travis.yml
diff --git a/Makefile b/Makefile
@@ -0,0 +1,5 @@
+PHP_CS_FIXER_VERSION=v3.4.0
+
+php-cs-fixer.phar:
+	wget --no-verbose https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/${PHP_CS_FIXER_VERSION}/php-cs-fixer.phar
+	chmod +x php-cs-fixer.phar
diff --git a/Model/FormTree.php b/Model/FormTree.php
@@ -67,18 +67,19 @@ public function addChild(FormTreeNode $node)
 
     /**
      * Set the loop back to the start
+     *
+     * @return void
      */
+    #[\ReturnTypeWillChange]
     public function rewind()
     {
         $this->position = 0;
     }
 
     /**
      * Return the length of the tree
-     *
-     * @return int
      */
-    public function count()
+    public function count(): int
     {
         return \count($this->nodes);
     }
@@ -88,6 +89,7 @@ public function count()
      *
      * @return FormTreeNode
      */
+    #[\ReturnTypeWillChange]
     public function current()
     {
         return $this->nodes[$this->position];
@@ -98,14 +100,18 @@ public function current()
      *
      * @return int
      */
+    #[\ReturnTypeWillChange]
     public function key()
     {
         return $this->position;
     }
 
     /**
      * Increment current position
+     *
+     * @return void
      */
+    #[\ReturnTypeWillChange]
     public function next()
     {
         ++$this->position;
@@ -116,6 +122,7 @@ public function next()
      *
      * @return int
      */
+    #[\ReturnTypeWillChange]
     public function valid()
     {
         return $this->offsetExists($this->position);
@@ -128,6 +135,7 @@ public function valid()
      *
      * @return bool
      */
+    #[\ReturnTypeWillChange]
     public function offsetExists($offset)
     {
         return isset($this->nodes[$offset]);
@@ -140,6 +148,7 @@ public function offsetExists($offset)
      *
      * @return FormTreeNode
      */
+    #[\ReturnTypeWillChange]
     public function offsetGet($offset)
     {
         return $this->offsetExists($offset) ? $this->nodes[$offset] : null;
@@ -150,7 +159,10 @@ public function offsetGet($offset)
      *
      * @param mixed $offset
      * @param mixed $value
+     *
+     * @return void
      */
+    #[\ReturnTypeWillChange]
     public function offsetSet($offset, $value)
     {
         /* Not implemented: Use addParent and addChild methods */
@@ -160,7 +172,10 @@ public function offsetSet($offset, $value)
      * Unset node at the given offset
      *
      * @param mixed $offset
+     *
+     * @return void
      */
+    #[\ReturnTypeWillChange]
     public function offsetUnset($offset)
     {
         /* Not implemented: FormTree nodes should not be unsetable */
diff --git a/composer.json b/composer.json
@@ -16,14 +16,13 @@
         }
     ],
     "require": {
-        "php": ">=7.1.0",
-        "symfony/framework-bundle": "~2.8|~3.0|~4.0|~5.0|~6.0",
-        "symfony/form": "~2.8|~3.0|~4.0|~5.0|~6.0",
-        "symfony/property-access": "~2.8|~3.0|~4.0|~5.0|~6.0"
+        "php": ">=7.4.0",
+        "symfony/framework-bundle": "~4.4|~5.0|~6.0",
+        "symfony/form": "~2.8|~3.0|~4.4|~5.0|~6.0",
+        "symfony/property-access": "~4.4|~5.0|~6.0"
     },
     "require-dev": {
-        "symfony/phpunit-bridge": "^5.0",
-        "friendsofphp/php-cs-fixer": "^2.16"
+        "symfony/phpunit-bridge": "^5.0"
     },
     "autoload": {
         "psr-4": {
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,33 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit
-    backupGlobals="false"
-    backupStaticAttributes="false"
-    colors="true"
-    convertErrorsToExceptions="true"
-    convertNoticesToExceptions="true"
-    convertWarningsToExceptions="true"
-    processIsolation="false"
-    stopOnFailure="false"
-    bootstrap="vendor/autoload.php"
->
-    <php>
-      <env name="SYMFONY_DEPRECATIONS_HELPER" value="max[direct]=0&amp;max[self]=0&amp;max[total]=9999&amp;verbose=1" />
-    </php>
-    <testsuites>
-        <testsuite name="ElaoFormTranslation Test Suite">
-            <directory suffix="Test.php">./Tests/</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./</directory>
-            <exclude>
-                <directory>./Resources</directory>
-                <directory>./Tests</directory>
-                <directory>./vendor</directory>
-            </exclude>
-        </whitelist>
-    </filter>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" backupStaticAttributes="false" colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" bootstrap="vendor/autoload.php" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+  <coverage>
+    <include>
+      <directory>./</directory>
+    </include>
+    <exclude>
+      <directory>./Resources</directory>
+      <directory>./Tests</directory>
+      <directory>./vendor</directory>
+    </exclude>
+  </coverage>
+  <php>
+    <env name="SYMFONY_DEPRECATIONS_HELPER" value="max[direct]=0&amp;max[self]=0&amp;max[total]=9999&amp;verbose=1"/>
+  </php>
+  <testsuites>
+    <testsuite name="ElaoFormTranslation Test Suite">
+      <directory suffix="Test.php">./Tests/</directory>
+    </testsuite>
+  </testsuites>
 </phpunit>

Original file line number	Diff line number	Diff line change
`@@ -67,18 +67,19 @@ public function addChild(FormTreeNode $node)`
`67`	`67`
`68`	`68`	`/**`
`69`	`69`	`* Set the loop back to the start`
	`70`	`+ *`
	`71`	`+ * @return void`
`70`	`72`	`*/`
	`73`	`+ #[\ReturnTypeWillChange]`
`71`	`74`	`public function rewind()`
`72`	`75`	`{`
`73`	`76`	`$this->position = 0;`
`74`	`77`	`}`
`75`	`78`
`76`	`79`	`/**`
`77`	`80`	`* Return the length of the tree`
`78`		`- *`
`79`		`- * @return int`
`80`	`81`	`*/`
`81`		`- public function count()`
	`82`	`+ public function count(): int`
`82`	`83`	`{`
`83`	`84`	`return \count($this->nodes);`
`84`	`85`	`}`
`@@ -88,6 +89,7 @@ public function count()`
`88`	`89`	`*`
`89`	`90`	`* @return FormTreeNode`
`90`	`91`	`*/`
	`92`	`+ #[\ReturnTypeWillChange]`
`91`	`93`	`public function current()`
`92`	`94`	`{`
`93`	`95`	`return $this->nodes[$this->position];`
`@@ -98,14 +100,18 @@ public function current()`
`98`	`100`	`*`
`99`	`101`	`* @return int`
`100`	`102`	`*/`
	`103`	`+ #[\ReturnTypeWillChange]`
`101`	`104`	`public function key()`
`102`	`105`	`{`
`103`	`106`	`return $this->position;`
`104`	`107`	`}`
`105`	`108`
`106`	`109`	`/**`
`107`	`110`	`* Increment current position`
	`111`	`+ *`
	`112`	`+ * @return void`
`108`	`113`	`*/`
	`114`	`+ #[\ReturnTypeWillChange]`
`109`	`115`	`public function next()`
`110`	`116`	`{`
`111`	`117`	`++$this->position;`
`@@ -116,6 +122,7 @@ public function next()`
`116`	`122`	`*`
`117`	`123`	`* @return int`
`118`	`124`	`*/`
	`125`	`+ #[\ReturnTypeWillChange]`
`119`	`126`	`public function valid()`
`120`	`127`	`{`
`121`	`128`	`return $this->offsetExists($this->position);`
`@@ -128,6 +135,7 @@ public function valid()`
`128`	`135`	`*`
`129`	`136`	`* @return bool`
`130`	`137`	`*/`
	`138`	`+ #[\ReturnTypeWillChange]`
`131`	`139`	`public function offsetExists($offset)`
`132`	`140`	`{`
`133`	`141`	`return isset($this->nodes[$offset]);`
`@@ -140,6 +148,7 @@ public function offsetExists($offset)`
`140`	`148`	`*`
`141`	`149`	`* @return FormTreeNode`
`142`	`150`	`*/`
	`151`	`+ #[\ReturnTypeWillChange]`
`143`	`152`	`public function offsetGet($offset)`
`144`	`153`	`{`
`145`	`154`	`return $this->offsetExists($offset) ? $this->nodes[$offset] : null;`
`@@ -150,7 +159,10 @@ public function offsetGet($offset)`
`150`	`159`	`*`
`151`	`160`	`* @param mixed $offset`
`152`	`161`	`* @param mixed $value`
	`162`	`+ *`
	`163`	`+ * @return void`
`153`	`164`	`*/`
	`165`	`+ #[\ReturnTypeWillChange]`
`154`	`166`	`public function offsetSet($offset, $value)`
`155`	`167`	`{`
`156`	`168`	`/* Not implemented: Use addParent and addChild methods */`
`@@ -160,7 +172,10 @@ public function offsetSet($offset, $value)`
`160`	`172`	`* Unset node at the given offset`
`161`	`173`	`*`
`162`	`174`	`* @param mixed $offset`
	`175`	`+ *`
	`176`	`+ * @return void`
`163`	`177`	`*/`
	`178`	`+ #[\ReturnTypeWillChange]`
`164`	`179`	`public function offsetUnset($offset)`
`165`	`180`	`{`
`166`	`181`	`/* Not implemented: FormTree nodes should not be unsetable */`