Merge pull request #199 from ciungulete/master

mollie · Aug 31, 2022 · a0e10d8 · a0e10d8
2 parents 605d1f6 + f25f6b7
commit a0e10d8
Show file tree

Hide file tree

Showing 11 changed files with 55 additions and 81 deletions.
diff --git a/.github/workflows/php-cs-fixer.yml → .github/workflows/pint.yml b/.github/workflows/php-cs-fixer.yml → .github/workflows/pint.yml
@@ -3,19 +3,23 @@ name: Check & fix styling
 on: [push]
 
 jobs:
-  php-cs-fixer:
+  pint:
     runs-on: ubuntu-latest
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           ref: ${{ github.head_ref }}
 
-      - name: Run PHP CS Fixer
-        uses: docker://oskarstark/php-cs-fixer-ga
-        with:
-          args: --config=.php-cs-fixer.dist.php --allow-risky=yes
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+
+      - name: Install Pint
+        run: composer global require laravel/pint
+
+      - name: Run Pint
+        run: pint
 
       - name: Commit changes
         uses: stefanzweifel/git-auto-commit-action@v4

diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
diff --git a/composer.json b/composer.json
@@ -44,14 +44,15 @@
     "php": "^7.3|^8.0",
     "illuminate/support": "^8.0|^9.0",
     "mollie/mollie-api-php": "^2.40",
-    "ext-json": "*"
+    "ext-json": "*",
+    "symfony/finder": "^5.0|6.0"
   },
   "require-dev": {
     "graham-campbell/testbench": "^5.0",
     "mockery/mockery": "^1.0",
     "phpunit/phpunit": "^9.0",
     "laravel/socialite": "^5.0",
-    "friendsofphp/php-cs-fixer": "^3.0"
+    "laravel/pint": "^1.1"
   },
   "suggest": {
     "laravel/socialite": "Use Mollie Connect (OAuth) to authenticate via Laravel Socialite with the Mollie API. This is needed for some endpoints."
@@ -81,7 +82,7 @@
   },
   "scripts": {
     "test": "./vendor/bin/phpunit tests",
-    "format": "./vendor/bin/php-cs-fixer fix --allow-risky=yes"
+    "format": "./vendor/bin/pint"
   },
   "minimum-stability": "dev",
   "prefer-stable": true

diff --git a/config/mollie.php b/config/mollie.php
@@ -27,6 +27,7 @@
  * @license     Berkeley Software Distribution License (BSD-License 2) http://www.opensource.org/licenses/bsd-license.php
  * @author      Mollie B.V. <[email protected]>
  * @copyright   Mollie B.V.
+ *
  * @link        https://www.mollie.com
  */
 return [

diff --git a/src/Facades/Mollie.php b/src/Facades/Mollie.php
@@ -27,8 +27,10 @@
  * @license     Berkeley Software Distribution License (BSD-License 2) http://www.opensource.org/licenses/bsd-license.php
  * @author      Mollie B.V. <[email protected]>
  * @copyright   Mollie B.V.
+ *
  * @link        https://www.mollie.com
  */
+
 namespace Mollie\Laravel\Facades;
 
 use Illuminate\Support\Facades\Facade;

diff --git a/src/MollieConnectProvider.php b/src/MollieConnectProvider.php
@@ -27,8 +27,10 @@
  * @license     Berkeley Software Distribution License (BSD-License 2) http://www.opensource.org/licenses/bsd-license.php
  * @author      Mollie B.V. <[email protected]>
  * @copyright   Mollie B.V.
+ *
  * @link        https://www.mollie.com
  */
+
 namespace Mollie\Laravel;
 
 use Illuminate\Support\Arr;
@@ -72,8 +74,7 @@ class MollieConnectProvider extends AbstractProvider implements ProviderInterfac
     /**
      * Get the authentication URL for the provider.
      *
-     * @param string $state
-     *
+     * @param  string  $state
      * @return string
      */
     protected function getAuthUrl($state)
@@ -94,8 +95,7 @@ protected function getTokenUrl()
     /**
      * Get the access token for the given code.
      *
-     * @param string $code
-     *
+     * @param  string  $code
      * @return string
      */
     public function getAccessToken($code)
@@ -111,8 +111,7 @@ public function getAccessToken($code)
     /**
      * Get the access token with a refresh token.
      *
-     * @param string $refresh_token
-     *
+     * @param  string  $refresh_token
      * @return array
      */
     public function getRefreshTokenResponse($refresh_token)
@@ -128,8 +127,7 @@ public function getRefreshTokenResponse($refresh_token)
     /**
      * Get the refresh tokenfields with a refresh token.
      *
-     * @param string $refresh_token
-     *
+     * @param  string  $refresh_token
      * @return array
      */
     protected function getRefreshTokenFields($refresh_token)
@@ -145,8 +143,7 @@ protected function getRefreshTokenFields($refresh_token)
     /**
      * Get the POST fields for the token request.
      *
-     * @param string $code
-     *
+     * @param  string  $code
      * @return array
      */
     public function getTokenFields($code)
@@ -157,8 +154,7 @@ public function getTokenFields($code)
     /**
      * Get the raw user for the given access token.
      *
-     * @param string $token
-     *
+     * @param  string  $token
      * @return array
      */
     protected function getUserByToken($token)
@@ -173,8 +169,7 @@ protected function getUserByToken($token)
     /**
      * Map the raw user array to a Socialite User instance.
      *
-     * @param array $user
-     *
+     * @param  array  $user
      * @return \Laravel\Socialite\AbstractUser
      */
     protected function mapUserToObject(array $user)

diff --git a/src/MollieManager.php b/src/MollieManager.php
@@ -27,8 +27,10 @@
  * @license     Berkeley Software Distribution License (BSD-License 2) http://www.opensource.org/licenses/bsd-license.php
  * @author      Mollie B.V. <[email protected]>
  * @copyright   Mollie B.V.
+ *
  * @link        https://www.mollie.com
  */
+
 namespace Mollie\Laravel;
 
 use Illuminate\Contracts\Container\Container;
@@ -46,8 +48,7 @@ class MollieManager
     /**
      * MollieManager constructor.
      *
-     * @param Container $app
-     *
+     * @param  Container  $app
      * @return void
      */
     public function __construct(Container $app)

diff --git a/src/MollieServiceProvider.php b/src/MollieServiceProvider.php
@@ -27,8 +27,10 @@
  * @license     Berkeley Software Distribution License (BSD-License 2) http://www.opensource.org/licenses/bsd-license.php
  * @author      Mollie B.V. <[email protected]>
  * @copyright   Mollie B.V.
+ *
  * @link        https://www.mollie.com
  */
+
 namespace Mollie\Laravel;
 
 use Illuminate\Contracts\Container\Container;
@@ -63,7 +65,7 @@ public function boot()
      */
     protected function setupConfig()
     {
-        $source = realpath(__DIR__ . '/../config/mollie.php');
+        $source = realpath(__DIR__.'/../config/mollie.php');
 
         // Check if the application is a Laravel OR Lumen instance to properly merge the configuration file.
         if ($this->app instanceof LaravelApplication && $this->app->runningInConsole()) {
@@ -129,7 +131,7 @@ protected function registerApiAdapter()
     protected function registerApiClient()
     {
         $this->app->singleton('mollie.api.client', function () {
-            return (new MollieApiClient())->addVersionString('MollieLaravel/' . self::PACKAGE_VERSION);
+            return (new MollieApiClient())->addVersionString('MollieLaravel/'.self::PACKAGE_VERSION);
         });
 
         $this->app->alias('mollie.api.client', MollieApiClient::class);

diff --git a/src/Wrappers/MollieApiWrapper.php b/src/Wrappers/MollieApiWrapper.php
@@ -27,8 +27,10 @@
  * @license     Berkeley Software Distribution License (BSD-License 2) http://www.opensource.org/licenses/bsd-license.php
  * @author      Mollie B.V. <[email protected]>
  * @copyright   Mollie B.V.
+ *
  * @link        https://www.mollie.com
  */
+
 namespace Mollie\Laravel\Wrappers;
 
 use Illuminate\Contracts\Config\Repository;
@@ -53,11 +55,11 @@ class MollieApiWrapper
     /**
      * MollieApiWrapper constructor.
      *
-     * @param Repository $config
-     * @param MollieApiClient $client
+     * @param  Repository  $config
+     * @param  MollieApiClient  $client
+     * @return void
      *
      * @throws \Mollie\Api\Exceptions\ApiException
-     * @return void
      */
     public function __construct(Repository $config, MollieApiClient $client)
     {
@@ -68,7 +70,7 @@ public function __construct(Repository $config, MollieApiClient $client)
     }
 
     /**
-     * @param string $url
+     * @param  string  $url
      */
     public function setApiEndpoint($url)
     {
@@ -84,7 +86,8 @@ public function getApiEndpoint()
     }
 
     /**
-     * @param string $api_key The Mollie API key, starting with 'test_' or 'live_'
+     * @param  string  $api_key The Mollie API key, starting with 'test_' or 'live_'
+     *
      * @throws ApiException
      */
     public function setApiKey($api_key)
@@ -93,7 +96,8 @@ public function setApiKey($api_key)
     }
 
     /**
-     * @param string $access_token OAuth access token, starting with 'access_'
+     * @param  string  $access_token OAuth access token, starting with 'access_'
+     *
      * @throws ApiException
      */
     public function setAccessToken($access_token)
@@ -290,6 +294,7 @@ public function organizationPartners()
 
     /**
      * @return void
+     *
      * @throws \Mollie\Api\Exceptions\HttpAdapterDoesNotSupportDebuggingException
      */
     public function enableDebugging()
@@ -299,6 +304,7 @@ public function enableDebugging()
 
     /**
      * @return void
+     *
      * @throws \Mollie\Api\Exceptions\HttpAdapterDoesNotSupportDebuggingException
      */
     public function disableDebugging()
@@ -309,7 +315,7 @@ public function disableDebugging()
     /**
      * Handle dynamic property calls.
      *
-     * @param  string $property
+     * @param  string  $property
      * @return mixed
      */
     public function __get($property)

diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -23,8 +23,7 @@ protected function getServiceProviderClass()
     /**
      * Get package providers.
      *
-     * @param  \Illuminate\Foundation\Application $app
-     *
+     * @param  \Illuminate\Foundation\Application  $app
      * @return array
      */
     protected function getPackageProviders($app)

diff --git a/tests/Wrappers/MollieApiWrapperTest.php b/tests/Wrappers/MollieApiWrapperTest.php
@@ -8,8 +8,6 @@
 
 /**
  * Class MollieApiWrapper
- *
- * @package Mollie\Laravel\Tests\Wrappers
  */
 class MollieApiWrapperTest extends TestCase
 {
@@ -178,10 +176,11 @@ public function testUnknownWrappedPropertyEndpoint()
      * Asserts that the referenced wrapper method matches the client attribute
      * I.e. $wrapper->payments() returns the same as $client->payments.
      *
-     * @param  MollieApiClient $client
-     * @param  MollieApiWrapper $wrapper
-     * @param  string $reference
+     * @param  MollieApiClient  $client
+     * @param  MollieApiWrapper  $wrapper
+     * @param  string  $reference
      * @return null
+     *
      * @throws ExpectationFailedException
      * @throws \SebastianBergmann\RecursionContext\InvalidArgumentException
      */
@@ -194,10 +193,11 @@ protected function assertWrappedEndpoint($client, $wrapper, $reference)
      * Asserts that the referenced wrapper property matches the client attribute
      * I.e. $wrapper->payments returns the same as $client->payments.
      *
-     * @param  MollieApiClient $client
-     * @param  MollieApiWrapper $wrapper
-     * @param  string $reference
+     * @param  MollieApiClient  $client
+     * @param  MollieApiWrapper  $wrapper
+     * @param  string  $reference
      * @return null
+     *
      * @throws ExpectationFailedException
      * @throws \SebastianBergmann\RecursionContext\InvalidArgumentException
      */