Update Code Style (#1070)

nelmio · Jan 8, 2021 · 65cab77 · 65cab77
1 parent fe747bb
commit 65cab77
Show file tree

Hide file tree

Showing 206 changed files with 9 additions and 354 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -1,10 +1,9 @@
 name: CI
 
 on:
-    pull_request:
-        branches: [ master ]
-    push:
-        branches: [ master ]
+  pull_request:
+  push:
+      branches: [ master, 2.x, 1.x ]
 
 jobs:
     run:

diff --git a/.github/workflows/static-analysis.yaml b/.github/workflows/static-analysis.yaml
@@ -21,9 +21,11 @@ jobs:
             - name: Install dependencies
               run: composer install --no-progress --no-interaction --prefer-dist
 
-# run phpcs
-#            - name: Run script
-#              run: vendor/bin/phpcs
+            - name: Install dependencies
+              run: composer bin php-cs-fixer update
+
+            - name: Run script
+              run: vendor-bin/php-cs-fixer/bin/php-cs-fixer fix --verbose --diff --dry-run
 
     phpstan:
         name: PHPStan

diff --git a/fixtures/Definition/FakeMethodCall.php b/fixtures/Definition/FakeMethodCall.php
@@ -18,31 +18,26 @@
 class FakeMethodCall implements MethodCallInterface
 {
     use NotCallableTrait;
-
 
     public function withArguments(array $arguments = null): void
     {
         $this->__call(__METHOD__, func_get_args());
     }
-
 
     public function getCaller(): void
     {
         $this->__call(__METHOD__, func_get_args());
     }
-
 
     public function getMethod(): string
     {
         $this->__call(__METHOD__, func_get_args());
     }
-
 
     public function getArguments(): array
     {
         $this->__call(__METHOD__, func_get_args());
     }
-
 
     public function __toString(): string
     {

diff --git a/fixtures/Definition/Fixture/DummyFixture.php b/fixtures/Definition/Fixture/DummyFixture.php
@@ -30,31 +30,26 @@ public function __construct(string $id)
     {
         $this->id = $id;
     }
-
 
     public function getId(): string
     {
         return $this->id;
     }
-
 
     public function getClassName(): string
     {
         $this->__call(__METHOD__, func_get_args());
     }
-
 
     public function getSpecs(): SpecificationBag
     {
         $this->__call(__METHOD__, func_get_args());
     }
-
 
     public function getValueForCurrent(): void
     {
         $this->__call(__METHOD__, func_get_args());
     }
-
 
     public function withSpecs(SpecificationBag $specs): void
     {

diff --git a/fixtures/Definition/Fixture/FakeFixture.php b/fixtures/Definition/Fixture/FakeFixture.php
@@ -20,31 +20,26 @@
 class FakeFixture implements FixtureInterface
 {
     use NotCallableTrait;
-
 
     public function getId(): string
     {
         $this->__call(__METHOD__, func_get_args());
     }
-
 
     public function getClassName(): string
     {
         $this->__call(__METHOD__, func_get_args());
     }
-
 
     public function getSpecs(): SpecificationBag
     {
         $this->__call(__METHOD__, func_get_args());
     }
-
 
     public function getValueForCurrent(): void
     {
         $this->__call(__METHOD__, func_get_args());
     }
-
 
     public function withSpecs(SpecificationBag $specs): void
     {

diff --git a/fixtures/Definition/Fixture/MutableFixture.php b/fixtures/Definition/Fixture/MutableFixture.php
@@ -42,19 +42,16 @@ public function __construct(string $id, string $className, SpecificationBag $spe
         $this->className = $className;
         $this->specs = $specs;
     }
-
 
     public function getId(): string
     {
         return $this->id;
     }
-
 
     public function getClassName(): string
     {
         return $this->className;
     }
-
 
     public function getSpecs(): SpecificationBag
     {
@@ -65,13 +62,11 @@ public function setSpecs(SpecificationBag $specs): void
     {
         $this->specs = $specs;
     }
-
 
     public function getValueForCurrent(): void
     {
         $this->__call(__METHOD__, func_get_args());
     }
-
 
     public function withSpecs(SpecificationBag $specs): void
     {

diff --git a/fixtures/Definition/Flag/ElementFlag.php b/fixtures/Definition/Flag/ElementFlag.php
@@ -27,7 +27,6 @@ public function __construct(string $element)
         $this->element = $element;
     }
 
-
     public function __toString(): string
     {
         return $this->element;

diff --git a/fixtures/Definition/Flag/ElementWithToStringFlag.php b/fixtures/Definition/Flag/ElementWithToStringFlag.php
@@ -32,7 +32,6 @@ public function __construct(string $element, string $toString)
         $this->element = $element;
         $this->toString = $toString;
     }
-
 
     public function __toString(): string
     {

diff --git a/fixtures/Definition/Flag/MutableFlag.php b/fixtures/Definition/Flag/MutableFlag.php
@@ -32,7 +32,6 @@ public function __construct(string $stringValue, $object)
         $this->stringValue = $stringValue;
         $this->object = $object;
     }
-
 
     public function __toString(): string
     {

diff --git a/fixtures/Definition/MethodCall/DummyMethodCall.php b/fixtures/Definition/MethodCall/DummyMethodCall.php
@@ -35,31 +35,26 @@ public function __construct(string $toString)
         $this->token = uniqid();
         $this->toString = $toString;
     }
-
 
     public function withArguments(array $arguments = null): self
     {
         $this->__call(__METHOD__, func_get_args());
     }
 
-
     public function getCaller(): void
     {
         $this->__call(__METHOD__, func_get_args());
     }
-
 
     public function getMethod(): string
     {
         $this->__call(__METHOD__, func_get_args());
     }
-
 
     public function getArguments(): array
     {
         $this->__call(__METHOD__, func_get_args());
     }
-
 
     public function __toString(): string
     {

diff --git a/fixtures/Definition/MethodCall/MutableMethodCall.php b/fixtures/Definition/MethodCall/MutableMethodCall.php
@@ -40,13 +40,11 @@ public function __construct(ServiceReferenceInterface $caller = null, $method, a
         $this->method = $method;
         $this->arguments = $arguments;
     }
-
 
     public function withArguments(array $arguments = null): void
     {
         $this->__call(__METHOD__, func_get_args());
     }
-
 
     public function getCaller()
     {
@@ -57,7 +55,6 @@ public function setCaller(ServiceReferenceInterface $caller = null): void
     {
         $this->caller = $caller;
     }
-
 
     public function getMethod(): string
     {
@@ -68,7 +65,6 @@ public function setMethod($method): void
     {
         $this->method = $method;
     }
-
 
     public function getArguments()
     {
@@ -79,7 +75,6 @@ public function setArguments(array $arguments = null): void
     {
         $this->arguments = $arguments;
     }
-
 
     public function __toString(): string
     {

diff --git a/fixtures/Definition/Object/ImmutableByCloneObject.php b/fixtures/Definition/Object/ImmutableByCloneObject.php
@@ -32,19 +32,16 @@ public function __construct(string $id, object $instance)
         $this->id = $id;
         $this->instance = $instance;
     }
-
 
     public function getId(): string
     {
         return $this->id;
     }
-
 
     public function getInstance()
     {
         return $this->instance;
     }
-
 
     public function withInstance(object $newInstance)
     {

diff --git a/fixtures/Definition/Object/ImmutableObject.php b/fixtures/Definition/Object/ImmutableObject.php
@@ -36,19 +36,16 @@ public function __construct(string $id, $instance)
         $this->id = $id;
         $this->instance = deep_clone($instance);
     }
-
 
     public function getId(): string
     {
         return $this->id;
     }
-
 
     public function getInstance()
     {
         return deep_clone($this->instance);
     }
-
 
     public function withInstance($newInstance)
     {

diff --git a/fixtures/Definition/ServiceReference/FakeReference.php b/fixtures/Definition/ServiceReference/FakeReference.php
@@ -19,7 +19,6 @@
 class FakeReference implements ServiceReferenceInterface
 {
     use NotCallableTrait;
-
 
     public function getId(): string
     {

diff --git a/fixtures/Definition/ServiceReference/MutableReference.php b/fixtures/Definition/ServiceReference/MutableReference.php
@@ -23,7 +23,6 @@ public function setId(string $id): void
     {
         $this->id = $id;
     }
-
 
     public function getId(): string
     {

diff --git a/fixtures/Definition/Value/DummyValue.php b/fixtures/Definition/Value/DummyValue.php
@@ -26,13 +26,11 @@ public function __construct(string $value)
     {
         $this->value = $value;
     }
-
 
     public function getValue()
     {
         return $this->value;
     }
-
 
     public function __toString(): string
     {

diff --git a/fixtures/Definition/Value/FakeObject.php b/fixtures/Definition/Value/FakeObject.php
@@ -19,19 +19,16 @@
 class FakeObject implements ObjectInterface
 {
     use NotCallableTrait;
-
 
     public function getId(): string
     {
         $this->__call(__METHOD__, func_get_args());
     }
-
 
     public function getInstance(): void
     {
         $this->__call(__METHOD__, func_get_args());
     }
-
 
     public function withInstance($newInstance): void
     {

diff --git a/fixtures/Definition/Value/FakeValue.php b/fixtures/Definition/Value/FakeValue.php
@@ -19,13 +19,11 @@
 class FakeValue implements ValueInterface
 {
     use NotCallableTrait;
-
 
     public function getValue(): void
     {
         $this->__call(__METHOD__, func_get_args());
     }
-
 
     public function __toString(): string
     {

diff --git a/fixtures/Definition/Value/MutableValue.php b/fixtures/Definition/Value/MutableValue.php
@@ -23,7 +23,6 @@ public function __construct($value)
     {
         $this->value = $value;
     }
-
 
     public function getValue()
     {
@@ -34,7 +33,6 @@ public function setValue($value): void
     {
         $this->value = $value;
     }
-
 
     public function __toString(): string
     {

diff --git a/fixtures/Entity/DummyWithNoArgumentConstructor.php b/fixtures/Entity/DummyWithNoArgumentConstructor.php
@@ -25,9 +25,6 @@ public function __construct()
         $this->args = func_get_args();
     }
 
-    /**
-     * @return array
-     */
     public function getArgs(): array
     {
         return $this->args;

diff --git a/fixtures/FileLocator/FakeFileLocator.php b/fixtures/FileLocator/FakeFileLocator.php
@@ -19,7 +19,6 @@
 class FakeFileLocator implements FileLocatorInterface
 {
     use NotCallableTrait;
-
 
     public function locate(string $name, string $currentPath = null): string
     {

diff --git a/fixtures/FixtureBuilder/Denormalizer/FakeDenormalizer.php b/fixtures/FixtureBuilder/Denormalizer/FakeDenormalizer.php
@@ -20,7 +20,6 @@
 class FakeDenormalizer implements DenormalizerInterface
 {
     use NotCallableTrait;
-
 
     public function denormalize(array $data): BareFixtureSet
     {
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,7 +27,6 @@ public function __construct(string $element) @@
             $this->element = $element;
         }
         public function __toString(): string
         {
             return $this->element;
@@ Expand Down @@