Merge pull request #242 from l0gicgate/add-github-actions

Add GitHub Actions
slimphp · Oct 2, 2021 · 23888ed · 23888ed
2 parents 7a2d344 + 0cde64b
commit 23888ed
Show file tree

Hide file tree

Showing 14 changed files with 95 additions and 37 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -0,0 +1,51 @@
+name: Tests
+
+on: [push, pull_request]
+
+jobs:
+    tests:
+        name: Tests PHP ${{ matrix.php }}
+        runs-on: ubuntu-latest
+        continue-on-error: ${{ matrix.experimental }}
+        strategy:
+            fail-fast: false
+            matrix:
+                php: [7.3, 7.4, 8.0]
+                experimental: [false]
+                include:
+                    - php: 8.0
+                      analysis: true
+                    - php: 8.1
+                      experimental: true
+
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v2
+
+            - name: Set up PHP ${{ matrix.php }}
+              uses: shivammathur/setup-php@v2
+              with:
+                  php-version: ${{ matrix.php }}
+                  coverage: xdebug
+
+            - name: Install dependencies with Composer
+              uses: ramsey/composer-install@v1
+
+            - name: Coding standards
+              if: matrix.analysis
+              run: vendor/bin/phpcs
+
+            - name: Static analysis
+              if: matrix.analysis
+              run: vendor/bin/phpstan
+
+            - name: Tests
+              run: vendor/bin/phpunit --coverage-clover clover.xml
+
+            - name: Upload coverage results to Coveralls
+              if: matrix.analysis
+              env:
+                  COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+              run: |
+                  composer require php-coveralls/php-coveralls -n -W
+                  vendor/bin/php-coveralls --coverage_clover=clover.xml -v
diff --git a/.travis.yml b/.travis.yml
diff --git a/composer.json b/composer.json
@@ -22,7 +22,7 @@
         }
     ],
     "require": {
-        "php": "^7.2 || ^8.0",
+        "php": "^7.3 || ^8.0",
         "ext-json": "*",
         "monolog/monolog": "^2.3",
         "php-di/php-di": "^6.3",
@@ -31,9 +31,11 @@
     },
     "require-dev": {
         "jangregor/phpstan-prophecy": "^0.8.1",
+        "phpspec/prophecy-phpunit": "^2.0",
         "phpstan/extension-installer": "^1.1.0",
         "phpstan/phpstan": "^0.12.99",
-        "phpunit/phpunit": "^8.0 || ^9.0"
+        "phpunit/phpunit": "^9.5.10",
+        "squizlabs/php_codesniffer": "^3.6"
     },
     "config": {
         "process-timeout": 0,

diff --git a/phpcs.xml b/phpcs.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<ruleset name="Slim coding standard">
+    <description>Slim coding standard</description>
+
+    <!-- display progress -->
+    <arg value="p"/>
+    <!-- use colors in output -->
+    <arg name="colors"/>
+
+    <!-- inherit rules from: -->
+    <rule ref="PSR2"/>
+    <rule ref="Generic.Arrays.DisallowLongArraySyntax"/>
+
+    <!-- Paths to check -->
+    <file>src</file>
+    <file>tests</file>
+</ruleset>
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -1,2 +1,4 @@
 parameters:
   level: 4
+  paths:
+    - src
diff --git a/src/Application/Actions/User/UserAction.php b/src/Application/Actions/User/UserAction.php
@@ -18,8 +18,9 @@ abstract class UserAction extends Action
      * @param LoggerInterface $logger
      * @param UserRepository $userRepository
      */
-    public function __construct(LoggerInterface $logger,
-                                UserRepository $userRepository
+    public function __construct(
+        LoggerInterface $logger,
+        UserRepository $userRepository
     ) {
         parent::__construct($logger);
         $this->userRepository = $userRepository;

diff --git a/src/Application/Handlers/HttpErrorHandler.php b/src/Application/Handlers/HttpErrorHandler.php
@@ -50,8 +50,7 @@ protected function respond(): Response
             }
         }
 
-        if (
-            !($exception instanceof HttpException)
+        if (!($exception instanceof HttpException)
             && $exception instanceof Throwable
             && $this->displayErrorDetails
         ) {

diff --git a/src/Application/Handlers/ShutdownHandler.php b/src/Application/Handlers/ShutdownHandler.php
@@ -74,7 +74,13 @@ public function __invoke()
             }
 
             $exception = new HttpInternalServerErrorException($this->request, $message);
-            $response = $this->errorHandler->__invoke($this->request, $exception, $this->displayErrorDetails, false, false);
+            $response = $this->errorHandler->__invoke(
+                $this->request,
+                $exception,
+                $this->displayErrorDetails,
+                false,
+                false,
+            );
 
             $responseEmitter = new ResponseEmitter();
             $responseEmitter->emit($response);

diff --git a/src/Application/ResponseEmitter/ResponseEmitter.php b/src/Application/ResponseEmitter/ResponseEmitter.php
@@ -19,7 +19,10 @@ public function emit(ResponseInterface $response): void
         $response = $response
             ->withHeader('Access-Control-Allow-Credentials', 'true')
             ->withHeader('Access-Control-Allow-Origin', $origin)
-            ->withHeader('Access-Control-Allow-Headers', 'X-Requested-With, Content-Type, Accept, Origin, Authorization')
+            ->withHeader(
+                'Access-Control-Allow-Headers',
+                'X-Requested-With, Content-Type, Accept, Origin, Authorization',
+            )
             ->withHeader('Access-Control-Allow-Methods', 'GET, POST, PUT, PATCH, DELETE, OPTIONS')
             ->withHeader('Cache-Control', 'no-store, no-cache, must-revalidate, max-age=0')
             ->withAddedHeader('Cache-Control', 'post-check=0, pre-check=0')

diff --git a/src/Application/Settings/Settings.php b/src/Application/Settings/Settings.php
@@ -27,4 +27,4 @@ public function get(string $key = '')
     {
         return (empty($key)) ? $this->settings : $this->settings[$key];
     }
-}
+}
diff --git a/src/Application/Settings/SettingsInterface.php b/src/Application/Settings/SettingsInterface.php
@@ -10,4 +10,4 @@ interface SettingsInterface
      * @return mixed
      */
     public function get(string $key = '');
-}
+}
diff --git a/tests/Application/Actions/User/ViewUserActionTest.php b/tests/Application/Actions/User/ViewUserActionTest.php
@@ -50,7 +50,7 @@ public function testActionThrowsUserNotFoundException()
         $responseFactory = $app->getResponseFactory();
 
         $errorHandler = new HttpErrorHandler($callableResolver, $responseFactory);
-        $errorMiddleware = new ErrorMiddleware($callableResolver, $responseFactory, true, false ,false);
+        $errorMiddleware = new ErrorMiddleware($callableResolver, $responseFactory, true, false, false);
         $errorMiddleware->setDefaultErrorHandler($errorHandler);
 
         $app->add($errorMiddleware);

diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -6,6 +6,7 @@
 use DI\ContainerBuilder;
 use Exception;
 use PHPUnit\Framework\TestCase as PHPUnit_TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Psr\Http\Message\ServerRequestInterface as Request;
 use Slim\App;
 use Slim\Factory\AppFactory;
@@ -16,6 +17,8 @@
 
 class TestCase extends PHPUnit_TestCase
 {
+    use ProphecyTrait;
+
     /**
      * @return App
      * @throws Exception

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -1,3 +1,2 @@
 <?php
 require __DIR__ . '/../vendor/autoload.php';
-
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,4 +27,4 @@ public function get(string $key = '') @@
         {
             return (empty($key)) ? $this->settings : $this->settings[$key];
         }
-    }
+    }
Original file line number	Diff line number	Diff line change
		@@ -1,3 +1,2 @@
		<?php
		require __DIR__ . '/../vendor/autoload.php';