Merge pull request #8 from ppavlovic/master

Added psr2 check and fixed code for compliance

Author: ppavlovic

composer.json

@@ -1,38 +1,49 @@
 {
-  "name": "g4/clean-core",
-  "description": "clean-core php library",
-  "keywords": [
-    "clean core",
-    "use case",
-    "service",
-    "clean architecture"
-  ],
-  "license": "MIT",
-  "authors": [
-    {
-        "name": "Drasko Gomboc",
-        "email": "drasko.gomboc@gmail.com"
+    "name": "g4/clean-core",
+    "description": "clean-core php library",
+    "keywords": [
+        "clean core",
+        "use case",
+        "service",
+        "clean architecture"
+    ],
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Drasko Gomboc",
+            "email": "drasko.gomboc@gmail.com"
+        },
+        {
+            "name": "Dejan Samardzija",
+            "email": "samardzija.dejan@gmail.com"
+        },
+        {
+            "name": "Ivan Krickovic",
+            "email": "ivan.krickovic@gmail.com"
+        }
+    ],
+    "autoload": {
+        "psr-4": {
+            "G4\\CleanCore\\": "src/"
+        }
     },
-    {
-        "name": "Dejan Samardzija",
-        "email": "samardzija.dejan@gmail.com"
+    "require-dev": {
+        "phpunit/phpunit": "3.7.*",
+        "rector/rector": "^0.14.6",
+        "squizlabs/php_codesniffer": "^3.7"
     },
-    {
-        "name": "Ivan Krickovic",
-        "email": "ivan.krickovic@gmail.com"
+    "require": {
+        "php": ">=7.3",
+        "ext-json": "*",
+        "g4/constants": "*",
+        "zendframework/zend-paginator": "2.*"
+    },
+    "scripts": {
+        "psr2-check": [
+            "./vendor/bin/phpcs --standard=PSR2 src/"
+        ],
+        "psr2-fix": [
+            "./vendor/bin/phpcbf --standard=PSR2 src/"
+        ]
     }
-  ],
-  "autoload": {
-    "psr-4": {"G4\\CleanCore\\": "src/"}
-  },
-  "require-dev": {
-    "phpunit/phpunit": "3.7.*",
-    "rector/rector": "^0.14.6"
-  },
-  "require": {
-      "php": ">=7.3",
-      "ext-json": "*",
-      "g4/constants": "*",
-      "zendframework/zend-paginator": "2.*"
-  }
 }

composer.lock

@@ -91,7 +91,7 @@ public function run(): self
             $this
                 ->initBootstrap()
                 ->runFrontController();
-        } catch(\Exception $exception) {
+        } catch (\Exception $exception) {
             $this->getError()
                 ->setException($exception)
                 ->setResponse($this->getResponse())

src/Application.php

@@ -21,4 +21,4 @@ public function getRequest(): \G4\CleanCore\Request\Request
     {
         return $this->request;
     }
-}
+}

src/Bootstrap/BootstrapAbstract.php

@@ -6,4 +6,4 @@ interface BootstrapInterface
 {
     public function init();
     public function getAllowedMedia();
-}
+}

src/Bootstrap/BootstrapInterface.php

@@ -19,7 +19,7 @@ class Factory
     /**
      * @var \G4\CleanCore\Request\Request
      */
-    private $_request;
+    private $request;
 
     public function initBootstrap(): void
     {
@@ -46,7 +46,7 @@ public function setAppNamespace(string $appNamespace): self
 
     public function setRequest(Request $request): self
     {
-        $this->_request = $request;
+        $this->request = $request;
         return $this;
     }
 
@@ -67,8 +67,8 @@ private function bootstrapFactory(): void
             $bootstrapName    = $this->fullBootstrapName;
             $this->bootstrap = new $bootstrapName();
             $this->bootstrap
-                ->setRequest($this->_request)
+                ->setRequest($this->request)
                 ->init();
         }
     }
-}
+}

src/Bootstrap/Factory.php

@@ -51,7 +51,6 @@ public function run(): void
         $this->dispatcher->isDispatchable()
             ? $this->dispatch()
             : $this->response->setHttpResponseCode(404);
-
     }
 
     public function setAppNamespace($appNamespace): self
@@ -88,4 +87,4 @@ private function dispatch(): void
 
         $this->response = $this->service->getFormattedResponse();
     }
-}
+}

src/Controller/Front.php

@@ -51,9 +51,6 @@ public function setRequest(Request $request): self
         return $this;
     }
 
-    /**
-     * @param string $serviceNamespace
-     */
     public function setAppNamespace(string $appNamespace): self
     {
         $this->appNamespace = $appNamespace;
@@ -62,7 +59,12 @@ public function setAppNamespace(string $appNamespace): self
 
     private function constructFullServiceName(): self
     {
-        $this->fullServiceName = join('\\', [$this->appNamespace, 'Service', $this->getServiceName(), $this->getClassName()]);
+        $this->fullServiceName = implode('\\', [
+            $this->appNamespace,
+            'Service',
+            $this->getServiceName(),
+            $this->getClassName()
+        ]);
         return $this;
     }
 
@@ -74,8 +76,9 @@ private function getClassName(): string
     private function getServiceName(): string
     {
         return ucfirst(
-            preg_replace_callback('/-([a-z])/',
-                function($matches): string {
+            preg_replace_callback(
+                '/-([a-z])/',
+                function ($matches): string {
                     return strtoupper($matches[1]);
                 },
                 $this->request->getResourceName()
@@ -95,4 +98,4 @@ private function serviceFactory(): void
             $this->service = new $serviceName();
         }
     }
-}
+}

src/Dispatcher/Dispatcher.php

@@ -44,9 +44,8 @@ private function addMessage(\G4\CleanCore\Exception\Validation $exception): void
 
     private function iterateTroughExceptions(): void
     {
-        foreach($this->exceptions as $oneException)
-        {
+        foreach ($this->exceptions as $oneException) {
             $this->addMessage($oneException);
         }
     }
-}
+}

src/Error/Validation.php

@@ -26,4 +26,4 @@ public function getValue()
     {
         return $this->value;
     }
-}
+}