Merge branch 'master' of github.com:api-skeletons/zf-oauth2-doctrine

Author: TomHAnderson

.travis.yml

@@ -13,40 +13,13 @@ env:
 matrix: 
  fast_finish: true
  include:
- - php: 5.5
- env:
- - DEPS=lowest
- - php: 5.5
- env:
- - DEPS=latest
- - EXECUTE_CS_CHECK=true
- - php: 5.6
- env:
- - DEPS=lowest
- - php: 5.6
- env:
- - EXECUTE_COVERAGE=true
- - DEPS=latest
- - php: 7.0
- env:
- - DEPS=lowest
- - php: 7.0
- env:
- - DEPS=latest
  - php: 7.1
  env:
+ - EXECUTE_COVERAGE=true
  - DEPS=lowest
  - php: 7.1
  env:
  - DEPS=latest
- - php: hhvm
- env:
- - DEPS=lowest
- - php: hhvm
- env:
- - DEPS=latest
- allow_failures:
- - php: hhvm
 
 notifications:
  irc: "irc.freenode.org#apigility-dev"

README.md

@@ -2,10 +2,17 @@ OAuth2 Doctrine ORM Adapter for Apigility
 =========================================
 
 [![Build Status](https://travis-ci.org/API-Skeletons/zf-oauth2-doctrine.svg)](https://travis-ci.org/API-Skeletons/zf-oauth2-doctrine)
+[![Documentation Status](https://readthedocs.org/projects/doctrine-in-apigility-docs/badge/?version=latest)](http://doctrine-in-apigility-docs.readthedocs.io/en/latest/zf-oauth2-doctrine/index.html)
 [![Total Downloads](https://poser.pugx.org/api-skeletons/zf-oauth2-doctrine/downloads)](https://packagist.org/packages/api-skeletons/zf-oauth2-doctrine)
 
 This provides a Doctrine adapter for [zfcampus/zf-mvc-auth](https://github.com/zfcampus/zf-mvc-auth) and [zfcampus/zf-oauth2](https://github.com/zfcampus/zf-oauth2) and entity definitions for all aspects of OAuth2 including Authorization Code, Access Tokens, Refresh Tokens, JWT & JTI, and Scopes.
 
+
+Versions
+--------
+
+The Version 1.x series is for PHP 5.5 to 7.0. The 2.x series is for PHP 7.1 onward.
+
 ![Entity Relationship Diagram](https://raw.githubusercontent.com/API-Skeletons/zf-oauth2-doctrine/master/media/oauth2-doctrine-erd.png)
 Entity Relationship Diagram created with [Skipper](https://skipper18.com)
 

composer.json

@@ -8,28 +8,28 @@
  "apigility"
  ],
  "require": {
- "php": "^5.5 || ^7.0",
- "zfcampus/zf-oauth2": "^1.3",
- "doctrine/orm": "^2.4.5",
- "doctrine/doctrine-module": "~0.8 || ^1.0",
- "doctrine/doctrine-orm-module": "~0.8 || ^1.0",
- "zfcampus/zf-mvc-auth": "^1.3",
- "zendframework/zend-mvc": "^2.4 || ^3.0.3",
- "zendframework/zend-config": "^2.4 || ^3.0",
- "zendframework/zend-modulemanager": "^2.4",
- "zendframework/zend-servicemanager": "^2.4 || ^3.0",
+ "php": ">=7.1",
+ "zfcampus/zf-oauth2": "^1.4",
+ "doctrine/orm": "^2.5.11",
+ "doctrine/doctrine-module": "^1.2",
+ "doctrine/doctrine-orm-module": "^1.1.5",
+ "zfcampus/zf-mvc-auth": "^1.4.3",
+ "zendframework/zend-mvc": "^3.1",
+ "zendframework/zend-config": "^3.1",
+ "zendframework/zend-modulemanager": "^2.8",
+ "zendframework/zend-servicemanager": "^3.3",
  "zendframework/zend-i18n": "^2.4"
  },
  "require-dev": {
- "phpunit/phpunit": "^4.8.8 || ^5.2 || ^6.0",
- "squizlabs/php_codesniffer": "^2.7",
- "zendframework/zend-form": "^2.4",
+ "phpunit/phpunit": "^6.0",
+ "squizlabs/php_codesniffer": "^3.1",
+ "zendframework/zend-form": "^2.10",
  "zendframework/zend-loader": "^2.4",
- "zendframework/zend-log": "^2.4",
- "zendframework/zend-serializer": "^2.4",
- "zendframework/zend-test": "^2.4 || ^3.0",
- "zendframework/zend-authentication": "^2.4",
- "zendframework/zend-eventmanager": "^2.4 || ^3.0",
+ "zendframework/zend-log": "^2.9",
+ "zendframework/zend-serializer": "^2.7",
+ "zendframework/zend-test": "^3.1",
+ "zendframework/zend-authentication": "^2.5",
+ "zendframework/zend-eventmanager": "^3.2",
  "mockery/mockery": "^0.9.5",
  "satooshi/php-coveralls": "^1.0"
  },

config/module.config.php

@@ -0,0 +1,70 @@
+<?php
+
+namespace ZF\OAuth2\Doctrine;
+
+use Zend\ServiceManager\Factory\InvokableFactory;
+
+class ConfigProvider
+{
+ /**
+ * Return general purpose zf-oauth2-doctrine configuration
+ *
+ * @return array
+ */
+ public function __invoke()
+ {
+ return [
+ 'dependencies' => $provider->getDependencyConfig(),
+ 'zf-apigility-doctrine-query-create-filter' => $provider->getQueryCreateFilterConfig(),
+ 'zf-apigility-doctrine-query-provider' => $provider->getQueryProviderConfig(),
+ ];
+ }
+
+ /**
+ * Return application-level dependency configuration.
+ *
+ * @return array
+ */
+ public function getDependencyConfig()
+ {
+ return [
+ 'factories' => [
+ Adapter\DoctrineAdapterFactory::class => InvokableFactory::class,
+ Mapper\MapperManager::class => InvokableFactory::class,
+ Adapter\DoctrineAdapter::class => InvokableFactory::class,
+ ],
+ 'shared' => [
+ Adapter\DoctrineAdapterFactory::class => false,
+ Mapper\MapperManager::class => false,
+ ],
+ ];
+ }
+
+ /**
+ * Return QueryCreateFilter configuration.
+ *
+ * @return array
+ */
+ public function getQueryCreateFilterConfig()
+ {
+ return [
+ 'initializers' => [
+ Query\OAuth2ServerInitializer::class,
+ ],
+ ];
+ }
+
+ /**
+ * Return QueryProvider configuration.
+ *
+ * @return array
+ */
+ public function getQueryProviderConfig()
+ {
+ return [
+ 'initializers' => [
+ Query\OAuth2ServerInitializer::class,
+ ],
+ ];
+ }
+}

src/ConfigProvider.php

@@ -7,6 +7,7 @@
 use Zend\ModuleManager\Feature\ConfigProviderInterface;
 use Zend\Config\Config;
 use Zend\Mvc\MvcEvent;
+use Zend\Loader\StandardAutoloader;
 use Zend\ServiceManager\ServiceLocatorInterface;
 use ZF\OAuth2\Doctrine\Adapter\DoctrineAdapterFactory;
 
@@ -21,7 +22,7 @@ class Module implements
  */
  public function getAutoloaderConfig()
  {
- return ['Zend\Loader\StandardAutoloader' => ['namespaces' => [
+ return [StandardAutoloader::class => ['namespaces' => [
  __NAMESPACE__ => __DIR__,
  ]]];
  }
@@ -33,7 +34,13 @@ public function getAutoloaderConfig()
  */
  public function getConfig()
  {
- return include __DIR__ . '/../config/module.config.php';
+ $provider = new ConfigProvider();
+
+ return [
+ 'service_manager' => $provider->getDependencyConfig(),
+ 'zf-apigility-doctrine-query-create-filter' => $provider->getQueryCreateFilterConfig(),
+ 'zf-apigility-doctrine-query-provider' => $provider->getQueryProviderConfig(),
+ ];
  }
 
  public function onBootstrap(MvcEvent $e)
@@ -54,6 +61,7 @@ public function getServiceConfig()
  /** @var DoctrineAdapterFactory $factory */
  $factory = $serviceManager->get(DoctrineAdapterFactory::class);
  $factory->setConfig($config);
+
  return $factory->createService($serviceManager);
  }
  ],