minor #3 Simpify test suite (chalasr)

This PR was merged into the 0.1-dev branch.

Discussion
----------

Simpify test suite

- Removes the ext-timecop dev dependency
- Stop using MicroKernelTrait to avoid the need for forward compatibility layers in test classes

Commits
-------

c3cd62f Simpify test suite

Author: chalasr

.travis.yml

@@ -15,7 +15,6 @@ cache:
         - $HOME/.composer/cache
 
 before_script:
-    - pecl install timecop-1.2.10
     - composer self-update
     - composer require --no-update symfony/config=$SYMFONY_VERSION symfony/http-kernel=$SYMFONY_VERSION symfony/dependency-injection=$SYMFONY_VERSION symfony/options-resolver=$SYMFONY_VERSION
     - composer require --no-update --dev symfony/framework-bundle=$SYMFONY_VERSION symfony/yaml=$SYMFONY_VERSION
@@ -24,4 +23,4 @@ before_script:
 script:
     - stty cols 120
     - if [ "$CHECK_CS" == 1 ]; then wget https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v2.15.8/php-cs-fixer.phar && php php-cs-fixer.phar fix --dry-run --diff; fi
-    - PSR_HTTP_PROVIDER=nyholm vendor/bin/simple-phpunit
+    - vendor/bin/simple-phpunit

README.md

@@ -4,16 +4,19 @@
 [![Latest Stable Version](https://poser.pugx.org/league/oauth2-server-bundle/v/stable)](https://packagist.org/packages/thephpleague/oauth2-server-bundle)
 
 OAuth2ServerBundle is a Symfony bundle integrating the [oauth2-server](https://github.com/thephpleague/oauth2-server) library into Symfony applications.
+Fork of trikoder/oauth2-bundle, for the better.
 
-## Status
+## Quick Start
 
-**Work in progress**
+1. Require the bundle and a PSR 7/17 implementation using Composer:
 
-Forked from of [Trikoder/OAuth2-Bundle](https://github.com).
+    ```sh
+    composer require league/oauth2-server-bundle nyholm/psr7
+    ```
 
 ## Documentation
 
 The docs [can be found in the `docs/` directory](docs/index.md) of this repository.
 
 ## License
-See the [LICENSE](LICENSE) file for license rights and limitations (MIT).
+See the [LICENSE](LICENSE) file for copyrights and limitations (MIT).

composer.json

@@ -27,7 +27,6 @@
         "symfony/security-bundle": "^4.4|^5.0"
     },
     "require-dev": {
-        "ext-timecop": "*",
         "laminas/laminas-diactoros": "^2.2",
         "nyholm/psr7": "^1.2",
         "symfony/browser-kit": "^4.4|^5.0",

dev/docker/Dockerfile

@@ -6,11 +6,9 @@ LABEL maintainer="Petar Obradović <[email protected]>"
 ARG COMPOSER_VERSION=1.9.3
 ARG FLEX_VERSION=1.6.2
 ARG PHP_CS_FIXER_VERSION=2.16.2
-ARG TIMECOP_VERSION=1.2.10
 ARG XDEBUG_VERSION=2.9.2
 
 ENV XDEBUG_REMOTE_AUTOSTART 0
-ENV TIMECOP_FUNC_OVERRIDE 0
 
 # This is where we're going to store all of our non-project specific binaries
 RUN mkdir -p /app/bin
@@ -27,10 +25,8 @@ RUN apk add --update --no-cache --virtual .build-deps \
         zip \
     && pecl install \
         xdebug-${XDEBUG_VERSION} \
-        timecop-${TIMECOP_VERSION} \
     && docker-php-ext-enable \
         xdebug \
-        timecop \
     && apk del --purge .build-deps
 
 RUN mv ${PHP_INI_DIR}/php.ini-development ${PHP_INI_DIR}/php.ini
@@ -41,9 +37,6 @@ RUN echo '[xdebug]' >> ${PHP_INI_DIR}/conf.d/docker-php-ext-xdebug.ini \
     && echo 'xdebug.remote_connect_back = 0' >> ${PHP_INI_DIR}/conf.d/docker-php-ext-xdebug.ini \
     && echo 'xdebug.remote_host = %XDEBUG_REMOTE_HOST%' >> ${PHP_INI_DIR}/conf.d/docker-php-ext-xdebug.ini
 
-RUN echo '[timecop]' >> ${PHP_INI_DIR}/conf.d/docker-php-ext-timecop.ini \
-    && echo 'timecop.func_override = ${TIMECOP_FUNC_OVERRIDE}' >> ${PHP_INI_DIR}/conf.d/docker-php-ext-timecop.ini
-
 # Utilities needed to run this image
 RUN apk add --update --no-cache \
         git \

docker-compose.yml

@@ -6,7 +6,6 @@ services:
             HOST_USER_ID: ${HOST_USER_ID}
             HOST_GROUP_ID: ${HOST_GROUP_ID}
             HOST_IP: ${HOST_IP:-}
-            PSR_HTTP_PROVIDER: ${PSR_HTTP_PROVIDER:-nyholm}
             SYMFONY_REQUIRE: ${SYMFONY_REQUIRE:-4.4.*}
         image: league/oauth2-server-bundle
         volumes:

docs/index.md

@@ -1,17 +1,9 @@
-# OAuth2-Server Bundle
-
-Symfony bundle which provides OAuth 2.1 authorization/resource server capabilities on top of the [thephpleague/oauth2-server](https://github.com/thephpleague/oauth2-server) library.
-
 ## Important notes
 
 This bundle provides the "glue" between  [thephpleague/oauth2-server](https://github.com/thephpleague/oauth2-server) library and the Symfony framework.
 It implements [thephpleague/oauth2-server](https://github.com/thephpleague/oauth2-server) library in a way specified by its official documentation.
 For implementation into Symfony projects, please see [bundle documentation](docs/basic-setup.md) and official [Symfony Security documentation](https://symfony.com/doc/current/security.html).
 
-## Status
-
-This package is currently in the active development.
-
 ## Features
 
 * API endpoint for client authorization and token issuing
@@ -124,7 +116,7 @@ This package is currently in the active development.
 
     ```yaml
     oauth2:
-        resource: '@LeagueOAuth2Bundle/Resources/config/routes.xml'
+        resource: '@LeagueOAuth2ServerBundle/Resources/config/routes.xml'
     ```
 
 You can verify that everything is working by issuing a `POST` request to the `/token` endpoint.

phpunit.xml.dist

@@ -12,6 +12,7 @@
         <env name="KERNEL_CLASS" value="League\Bundle\OAuth2ServerBundle\Tests\TestKernel" />
         <env name="SHELL_VERBOSITY" value="-1" />
         <env name="SYMFONY_DEPRECATIONS_HELPER" value="max[self]=0" />
+        <env name="SYMFONY_PHPUNIT_REMOVE" value="" />
     </php>
 
     <testsuites>
@@ -36,8 +37,4 @@
             </exclude>
         </whitelist>
     </filter>
-
-    <listeners>
-        <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener" />
-    </listeners>
 </phpunit>

src/Resources/config/storage/doctrine.xml

@@ -20,34 +20,19 @@
         <service id="League\Bundle\OAuth2ServerBundle\Manager\Doctrine\ClientManager">
             <argument key="$entityManager" />
         </service>
-        <service id="league.oauth2-server.manager.doctrine.client_manager" alias="League\Bundle\OAuth2ServerBundle\Manager\Doctrine\ClientManager">
-            <deprecated>The "%alias_id%" service alias is deprecated and will be removed in v4.</deprecated>
-        </service>
 
         <service id="League\Bundle\OAuth2ServerBundle\Manager\Doctrine\AccessTokenManager">
             <argument key="$entityManager" />
         </service>
-        <service id="league.oauth2-server.manager.doctrine.access_token_manager" alias="League\Bundle\OAuth2ServerBundle\Manager\Doctrine\AccessTokenManager">
-            <deprecated>The "%alias_id%" service alias is deprecated and will be removed in v4.</deprecated>
-        </service>
 
         <service id="League\Bundle\OAuth2ServerBundle\Manager\Doctrine\RefreshTokenManager">
             <argument key="$entityManager" />
         </service>
-        <service id="league.oauth2-server.manager.doctrine.refresh_token_manager" alias="League\Bundle\OAuth2ServerBundle\Manager\Doctrine\RefreshTokenManager">
-            <deprecated>The "%alias_id%" service alias is deprecated and will be removed in v4.</deprecated>
-        </service>
 
         <service id="League\Bundle\OAuth2ServerBundle\Manager\InMemory\ScopeManager" />
-        <service id="league.oauth2-server.manager.in_memory.scope_manager" alias="League\Bundle\OAuth2ServerBundle\Manager\InMemory\ScopeManager">
-            <deprecated>The "%alias_id%" service alias is deprecated and will be removed in v4.</deprecated>
-        </service>
 
         <service id="League\Bundle\OAuth2ServerBundle\Manager\Doctrine\AuthorizationCodeManager">
             <argument key="$entityManager" />
         </service>
-        <service id="league.oauth2-server.manager.doctrine.authorization_code_manager" alias="League\Bundle\OAuth2ServerBundle\Manager\Doctrine\AuthorizationCodeManager">
-            <deprecated>The "%alias_id%" service alias is deprecated and will be removed in v4.</deprecated>
-        </service>
     </services>
 </container>