Skip to content

Commit a343efe

Browse files
committed
Init
1 parent 6ea74bc commit a343efe

File tree

141 files changed

+1039
-1934
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

141 files changed

+1039
-1934
lines changed

.gitattributes

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/Tests export-ignore
1+
/tests export-ignore
22
/dev export-ignore
33
/.editorconfig export-ignore
44
/.gitattributes export-ignore

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ phpunit.xml
1111
.phpunit.result.cache
1212

1313
# Tests
14-
Tests/.kernel/
14+
tests/.kernel/

.php_cs.dist

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ return PhpCsFixer\Config::create()
2525
'list_syntax' => ['syntax' => 'short'],
2626
'no_null_property_initialization' => true,
2727
'no_superfluous_phpdoc_tags' => true,
28-
'nullable_type_declaration_for_default_null_value' => true,
2928
'ordered_imports' => [
3029
'imports_order' => [
3130
OrderedImportsFixer::IMPORT_TYPE_CONST,

.travis.yml

Lines changed: 23 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,27 @@
1-
dist: bionic
2-
3-
sudo: required
4-
5-
language: bash
6-
7-
services:
8-
- docker
9-
10-
env:
11-
# PHP 7.2
12-
- PHP_VERSION=7.2 PSR_HTTP_PROVIDER=nyholm SYMFONY_REQUIRE=4.4.*
13-
- PHP_VERSION=7.2 PSR_HTTP_PROVIDER=zendframework SYMFONY_REQUIRE=4.4.*
14-
- PHP_VERSION=7.2 COMPOSER_FLAGS="--prefer-lowest" SYMFONY_REQUIRE=4.4.*
15-
- PHP_VERSION=7.2 PSR_HTTP_PROVIDER=nyholm SYMFONY_REQUIRE=5.0.*
16-
- PHP_VERSION=7.2 PSR_HTTP_PROVIDER=zendframework SYMFONY_REQUIRE=5.0.*
17-
- PHP_VERSION=7.2 COMPOSER_FLAGS="--prefer-lowest" SYMFONY_REQUIRE=5.0.*
18-
19-
# PHP 7.3
20-
- PHP_VERSION=7.3 PSR_HTTP_PROVIDER=nyholm SYMFONY_REQUIRE=4.4.*
21-
- PHP_VERSION=7.3 PSR_HTTP_PROVIDER=zendframework SYMFONY_REQUIRE=4.4.*
22-
- PHP_VERSION=7.3 COMPOSER_FLAGS="--prefer-lowest" SYMFONY_REQUIRE=4.4.*
23-
- PHP_VERSION=7.3 PSR_HTTP_PROVIDER=nyholm SYMFONY_REQUIRE=5.0.*
24-
- PHP_VERSION=7.3 PSR_HTTP_PROVIDER=zendframework SYMFONY_REQUIRE=5.0.*
25-
- PHP_VERSION=7.3 COMPOSER_FLAGS="--prefer-lowest" SYMFONY_REQUIRE=5.0.*
26-
27-
# PHP 7.4
28-
- PHP_VERSION=7.4 PSR_HTTP_PROVIDER=nyholm SYMFONY_REQUIRE=4.4.*
29-
- PHP_VERSION=7.4 PSR_HTTP_PROVIDER=zendframework SYMFONY_REQUIRE=4.4.*
30-
- PHP_VERSION=7.4 COMPOSER_FLAGS="--prefer-lowest" SYMFONY_REQUIRE=4.4.*
31-
- PHP_VERSION=7.4 PSR_HTTP_PROVIDER=nyholm SYMFONY_REQUIRE=5.0.*
32-
- PHP_VERSION=7.4 PSR_HTTP_PROVIDER=zendframework SYMFONY_REQUIRE=5.0.*
33-
- PHP_VERSION=7.4 COMPOSER_FLAGS="--prefer-lowest" SYMFONY_REQUIRE=5.0.*
34-
35-
install:
36-
- dev/bin/docker-compose build --build-arg PHP_VERSION=${PHP_VERSION} php
1+
language: php
2+
dist: xenial
3+
sudo: false
4+
5+
matrix:
6+
include:
7+
- php: 7.1
8+
env: SYMFONY_VERSION="4.4.*" COMPOSER_FLAGS="--prefer-lowest"
9+
- php: 7.4
10+
env: SYMFONY_VERSION="5.1.*" CHECK_CS=1
11+
fast_finish: true
12+
13+
cache:
14+
directories:
15+
- $HOME/.composer/cache
3716

3817
before_script:
39-
# Our docker image has symfony/flex installed to make sure SYMFONY_REQUIRE is working
40-
- dev/bin/php composer update --ansi --prefer-dist ${COMPOSER_FLAGS:-}
18+
- pecl install timecop-1.2.10
19+
- composer self-update
20+
- composer require --no-update symfony/config=$SYMFONY_VERSION symfony/http-kernel=$SYMFONY_VERSION symfony/dependency-injection=$SYMFONY_VERSION symfony/options-resolver=$SYMFONY_VERSION
21+
- composer require --no-update --dev symfony/framework-bundle=$SYMFONY_VERSION symfony/yaml=$SYMFONY_VERSION
22+
- composer update $COMPOSER_FLAGS --prefer-dist
4123

4224
script:
43-
- dev/bin/php-test composer test -- --colors=always --coverage-clover=coverage.xml --debug
44-
- dev/bin/php composer lint -- --ansi --diff --dry-run --using-cache=no --verbose
45-
46-
after_script:
47-
- dev/bin/docker-compose down --volumes
48-
49-
after_success:
50-
- bash <(curl -s https://codecov.io/bash)
25+
- stty cols 120
26+
- 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
27+
- PSR_HTTP_PROVIDER=nyholm vendor/bin/simple-phpunit

CHANGELOG.md

Lines changed: 51 additions & 51 deletions
Large diffs are not rendered by default.

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
All contributions are **welcome** and **very much appreciated**.
44

5-
We accept contributions via Pull Requests on [Github](https://github.com/trikoder/oauth2-bundle).
5+
We accept contributions via Pull Requests on [Github](https://github.com/thephpleague/oauth2-server-bundle).
66

77
## Pull Request guidelines
88

Event/UserResolveEvent.php

Lines changed: 0 additions & 78 deletions
This file was deleted.

LICENSE.md renamed to LICENSE

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
1-
The MIT License (MIT)
2-
3-
Copyright (c) 2018 Trikoder
1+
Copyright (c) 2020 Robin Chalas
2+
Portions Copyright (c) 2018-2020 Trikoder
43

54
Permission is hereby granted, free of charge, to any person obtaining a copy
65
of this software and associated documentation files (the "Software"), to deal
76
in the Software without restriction, including without limitation the rights
87
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9-
copies of the Software, and to permit persons to whom the Software is
10-
furnished to do so, subject to the following conditions:
8+
copies of the Software, and to permit persons to whom the Software is furnished
9+
to do so, subject to the following conditions:
1110

1211
The above copyright notice and this permission notice shall be included in all
1312
copies or substantial portions of the Software.
@@ -17,5 +16,5 @@ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
1716
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
1817
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
1918
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21-
SOFTWARE.
19+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
20+
THE SOFTWARE.

League/Repository/UserRepository.php

Lines changed: 0 additions & 72 deletions
This file was deleted.

OAuth2Events.php

Lines changed: 0 additions & 33 deletions
This file was deleted.

0 commit comments

Comments
 (0)