ZF3 Compatibility (#10)

jaydiablo · aripringle · commit ec97e5b31e48 · 2018-02-14T12:18:51.000-07:00
* zf3 compatible changes

* better support for 2.x servicemanager

* updating cs-fixer, adding travis, some badges!

* Adding travis badge - kicking off build

* Removing php-stan for now, since not php 5.6 compatible
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 /composer.lock
 /vendor
+/.php_cs.cache
diff --git a/.php_cs b/.php_cs
@@ -1,8 +1,21 @@
 <?php
 
-// Needed to get styleci-bridge loaded
-require_once __DIR__.'/vendor/sllh/php-cs-fixer-styleci-bridge/autoload.php';
+$finder = PhpCsFixer\Finder::create()
+    ->exclude('vendor')
+    ->files()
+    ->in(__DIR__)
+;
 
-use SLLH\StyleCIBridge\ConfigBridge;
-
-return ConfigBridge::create();
+return PhpCsFixer\Config::create()
+    ->setRiskyAllowed(true)
+    ->setRules([
+        '@PSR2' => true,
+        'binary_operator_spaces' => ['align_double_arrow' => true, 'align_equals' => true],
+        'single_quote' => false,
+        'array_syntax' => ['syntax' => 'short'],
+        'concat_space' => ['spacing' => 'one'],
+        'dir_constant' => true
+    ])
+    ->setUsingCache(true)
+    ->setFinder($finder);
+;
diff --git a/.styleci.yml b/.styleci.yml
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,26 @@
+language: php
+
+php:
+  - 5.6
+  - 7.0
+  - 7.1
+  - 7.2
+  - nightly
+  - hhvm
+
+branches:
+  only:
+    master
+
+before_script:
+  - travis_retry composer self-update
+  - travis_retry composer install --no-interaction --prefer-source
+
+script:
+  - composer check-style
+
+matrix:
+  fast_finish: true
+  allow_failures:
+    - php: hhvm
+    - php: nightly
diff --git a/README.md b/README.md
@@ -1,6 +1,10 @@
 zf2-oauth2-server
 =================
 
-[![StyleCI](https://styleci.io/repos/12762708/shield)](https://styleci.io/repos/12762708) [![SensioLabsInsight](https://insight.sensiolabs.com/projects/dbd179b4-3671-47b2-86dc-2582fd0f69e4/mini.png)](https://insight.sensiolabs.com/projects/dbd179b4-3671-47b2-86dc-2582fd0f69e4)
+[![Build Status](https://travis-ci.org/diablomedia/zf2-oauth2-server.svg?branch=master)](https://travis-ci.org/diablomedia/zf2-oauth2-server)
+[![Latest Stable Version](https://poser.pugx.org/diablomedia/zf2-oauth2-server/v/stable)](https://packagist.org/packages/diablomedia/zf2-oauth2-server)
+[![Total Downloads](https://poser.pugx.org/diablomedia/zf2-oauth2-server/downloads)](https://packagist.org/packages/diablomedia/zf2-oauth2-server)
+[![License](https://poser.pugx.org/diablomedia/zf2-oauth2-server/license)](https://packagist.org/packages/diablomedia/zf2-oauth2-server)
+[![SensioLabsInsight](https://insight.sensiolabs.com/projects/dbd179b4-3671-47b2-86dc-2582fd0f69e4/mini.png)](https://insight.sensiolabs.com/projects/dbd179b4-3671-47b2-86dc-2582fd0f69e4)
 
 Skeleton ZF2 module implementing bshaffer's oauth2-server library
diff --git a/composer.json b/composer.json
@@ -16,10 +16,14 @@
             "homepage": "https://diablomedia.com/"
         }
     ],
-    "homepage": "http://github.com/diablomedia/zf2-oauth2-server",
+    "homepage": "https://github.com/diablomedia/zf2-oauth2-server",
     "require": {
         "php": ">=5.6.0",
-        "diablomedia/oauth2-server-zendhttp-bridge": "^2.0.0"
+        "bshaffer/oauth2-server-php": "^1.7",
+        "diablomedia/oauth2-server-zendhttp-bridge": "^2.0.0",
+        "zendframework/zend-form": "^2.0.0",
+        "zendframework/zend-view": "^2.0.0",
+        "zendframework/zend-mvc": "^2.0 || ^3.0"
     },
     "autoload": {
         "psr-0": {"OAuth2Server": "src/"},
@@ -28,7 +32,10 @@
         ]
     },
     "require-dev": {
-        "sllh/php-cs-fixer-styleci-bridge": "^2.0",
-        "friendsofphp/php-cs-fixer": "^1.11"
+        "friendsofphp/php-cs-fixer": "^2.0"
+    },
+    "scripts": {
+        "fix-style": "php-cs-fixer fix",
+        "check-style": "php-cs-fixer fix --dry-run -vv"
     }
 }
diff --git a/config/module.config.php b/config/module.config.php
@@ -1,9 +1,10 @@
 <?php
+
 return [
     'controllers' => [
-        'invokables' => [
-            'OAuth2Server\Controller\Authorize' => 'OAuth2Server\Controller\AuthorizeController'
-        ]
+        'factories' => [
+            'OAuth2Server\Controller\Authorize' => OAuth2Server\Controller\Factory\AuthorizeControllerFactory::class,
+        ],
     ],
     'router' => [
         'routes' => [
@@ -42,8 +43,8 @@
         ],
     ],
     'oauth2server' => [
-        'storage_class' => '\OAuth2\Storage\Memory',
+        'storage_class'        => '\OAuth2\Storage\Memory',
         'authorize_form_class' => '\OAuth2Server\Form\AuthorizeForm',
-        'server_config' => [],
+        'server_config'        => [],
     ],
 ];
diff --git a/src/OAuth2Server/Controller/AuthorizeController.php b/src/OAuth2Server/Controller/AuthorizeController.php
@@ -5,62 +5,77 @@
 use Zend\Mvc\Controller\AbstractActionController;
 use Zend\View\Model\JsonModel;
 use OAuth2\ZendHttpPhpEnvironmentBridge\Request;
+use OAuth2\Server;
 
 class AuthorizeController extends AbstractActionController
 {
     protected $userId;
     protected $preAuthorized = false;
 
+    private $server;
+    private $authorizeForm;
+
+    public function __construct(Server $server, $authorizeForm)
+    {
+        $this->server        = $server;
+        $this->authorizeForm = $authorizeForm;
+    }
+
     public function authorizeAction()
     {
         $this->getEventManager()->trigger('authorize.pre', $this);
 
-        $serviceManager = $this->getServiceLocator();
-        $request = Request::createFromRequest($this->getRequest());
+        $request  = Request::createFromRequest($this->getRequest());
         $response = $this->getResponse();
-        $server = $serviceManager->get('OAuth2Server\Server');
 
         if ($this->preAuthorized) {
             $isAuthorized = true;
         } else {
-            $form = $serviceManager->get('OAuth2Server\AuthorizeForm');
-            $form->setData($request->getQuery());
-            if ($request->getQuery('authorize') && $form->isValid()) {
+            $this->authorizeForm->setData($request->getQuery());
+            if ($request->getQuery('authorize') && $this->authorizeForm->isValid()) {
                 $isAuthorized = true;
-            } elseif ($request->getQuery('deny') && $form->isValid()) {
+            } elseif ($request->getQuery('deny') && $this->authorizeForm->isValid()) {
                 $isAuthorized = false;
             }
         }
         if (isset($isAuthorized)) {
-            $this->getEventManager()->trigger('authorize.preHandle', $this, ['isAuthorized' => $isAuthorized, 'preAuthorized' => $this->preAuthorized]);
-
-            $response = $server->handleAuthorizeRequest($request, $this->getResponse(), $isAuthorized, $this->userId);
+            $this->getEventManager()->trigger(
+                'authorize.preHandle',
+                $this,
+                ['isAuthorized' => $isAuthorized, 'preAuthorized' => $this->preAuthorized]
+            );
+
+            $response = $this->server->handleAuthorizeRequest(
+                $request,
+                $this->getResponse(),
+                $isAuthorized,
+                $this->userId
+            );
             $response->sendHeaders();
             return new JsonModel($response->getContent());
         }
 
-        if (!$server->validateAuthorizeRequest($request, $response)) {
-            $headers = $response->getHeaders();
+        if (!$this->server->validateAuthorizeRequest($request, $response)) {
+            $headers  = $response->getHeaders();
             $location = $headers->get('location');
             if ($location) {
                 $headers->removeHeader($location);
             }
             return new JsonModel($response->getContent());
         }
 
-        $form->setData($request->getQuery());
-        $client = $server->getStorage('client')->getClientDetails($request->getQuery('client_id'));
+        $this->authorizeForm->setData($request->getQuery());
+        $client = $this->server->getStorage('client')->getClientDetails($request->getQuery('client_id'));
 
         $this->getEventManager()->trigger('authorize.post', $this);
 
-        return ['form' => $form, 'appname' => $client['name']];
+        return ['form' => $this->authorizeForm, 'appname' => $client['name']];
     }
 
     public function tokenAction()
     {
-        $server = $this->getServiceLocator()->get('OAuth2Server\Server');
-        $request = Request::createFromRequest($this->getRequest());
-        $response = $server->handleTokenRequest($request, $this->getResponse());
+        $request  = Request::createFromRequest($this->getRequest());
+        $response = $this->server->handleTokenRequest($request, $this->getResponse());
 
         return new JsonModel($response->getContent());
     }
diff --git a/src/OAuth2Server/Controller/Factory/AuthorizeControllerFactory.php b/src/OAuth2Server/Controller/Factory/AuthorizeControllerFactory.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace OAuth2Server\Controller\Factory;
+
+use Zend\ServiceManager\FactoryInterface;
+use OAuth2Server\Controller\AuthorizeController;
+use Interop\Container\ContainerInterface;
+use Zend\ServiceManager\ServiceLocatorInterface;
+
+class AuthorizeControllerFactory implements FactoryInterface
+{
+    public function createService(ServiceLocatorInterface $serviceLocator)
+    {
+        return $this($serviceLocator->getServiceLocator(), AuthorizeController::class);
+    }
+
+    public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
+    {
+        return new AuthorizeController(
+            $container->get('OAuth2Server\Server'),
+            $container->get('OAuth2Server\AuthorizeForm')
+        );
+    }
+}
diff --git a/src/OAuth2Server/Form/AuthorizeForm.php b/src/OAuth2Server/Form/AuthorizeForm.php
@@ -16,47 +16,47 @@ public function __construct($name, $csrfSalt)
 
         $this->add(
             [
-                'name' => 'client_id',
+                'name'       => 'client_id',
                 'attributes' => [
                     'type' => 'hidden'
                 ]
             ]
         );
         $this->add(
             [
-                'name' => 'redirect_uri',
+                'name'       => 'redirect_uri',
                 'attributes' => [
                     'type' => 'hidden'
                 ]
             ]
         );
         $this->add(
             [
-                'name' => 'response_type',
+                'name'       => 'response_type',
                 'attributes' => [
                     'type' => 'hidden'
                 ]
             ]
         );
         $this->add(
             [
-                'name' => 'state',
+                'name'       => 'state',
                 'attributes' => [
                     'type' => 'hidden'
                 ]
             ]
         );
         $this->add(
             [
-                'name' => 'scope',
+                'name'       => 'scope',
                 'attributes' => [
                     'type' => 'hidden'
                 ]
             ]
         );
         $this->add(
             [
-                'name' => 'authorize',
+                'name'       => 'authorize',
                 'attributes' => [
                     'type'  => 'submit',
                     'class' => 'btn btn-primary',
@@ -67,7 +67,7 @@ public function __construct($name, $csrfSalt)
 
         $this->add(
             [
-                'name' => 'deny',
+                'name'       => 'deny',
                 'attributes' => [
                     'type'  => 'submit',
                     'class' => 'btn btn-danger',

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`/composer.lock`
`2`	`2`	`/vendor`
	`3`	`+/.php_cs.cache`
Original file line number	Diff line number	Diff line change
`@@ -16,47 +16,47 @@ public function __construct($name, $csrfSalt)`
`16`	`16`
`17`	`17`	`$this->add(`
`18`	`18`	`[`
`19`		`- 'name' => 'client_id',`
	`19`	`+ 'name' => 'client_id',`
`20`	`20`	`'attributes' => [`
`21`	`21`	`'type' => 'hidden'`
`22`	`22`	`]`
`23`	`23`	`]`
`24`	`24`	`);`
`25`	`25`	`$this->add(`
`26`	`26`	`[`
`27`		`- 'name' => 'redirect_uri',`
	`27`	`+ 'name' => 'redirect_uri',`
`28`	`28`	`'attributes' => [`
`29`	`29`	`'type' => 'hidden'`
`30`	`30`	`]`
`31`	`31`	`]`
`32`	`32`	`);`
`33`	`33`	`$this->add(`
`34`	`34`	`[`
`35`		`- 'name' => 'response_type',`
	`35`	`+ 'name' => 'response_type',`
`36`	`36`	`'attributes' => [`
`37`	`37`	`'type' => 'hidden'`
`38`	`38`	`]`
`39`	`39`	`]`
`40`	`40`	`);`
`41`	`41`	`$this->add(`
`42`	`42`	`[`
`43`		`- 'name' => 'state',`
	`43`	`+ 'name' => 'state',`
`44`	`44`	`'attributes' => [`
`45`	`45`	`'type' => 'hidden'`
`46`	`46`	`]`
`47`	`47`	`]`
`48`	`48`	`);`
`49`	`49`	`$this->add(`
`50`	`50`	`[`
`51`		`- 'name' => 'scope',`
	`51`	`+ 'name' => 'scope',`
`52`	`52`	`'attributes' => [`
`53`	`53`	`'type' => 'hidden'`
`54`	`54`	`]`
`55`	`55`	`]`
`56`	`56`	`);`
`57`	`57`	`$this->add(`
`58`	`58`	`[`
`59`		`- 'name' => 'authorize',`
	`59`	`+ 'name' => 'authorize',`
`60`	`60`	`'attributes' => [`
`61`	`61`	`'type' => 'submit',`
`62`	`62`	`'class' => 'btn btn-primary',`
`@@ -67,7 +67,7 @@ public function __construct($name, $csrfSalt)`
`67`	`67`
`68`	`68`	`$this->add(`
`69`	`69`	`[`
`70`		`- 'name' => 'deny',`
	`70`	`+ 'name' => 'deny',`
`71`	`71`	`'attributes' => [`
`72`	`72`	`'type' => 'submit',`
`73`	`73`	`'class' => 'btn btn-danger',`