Skip to content

Commit

Permalink
start new branch 5.x, which target for drupal/core:~8.4 integration
Browse files Browse the repository at this point in the history
  • Loading branch information
hswong3i committed Jun 3, 2017
1 parent ee8fe00 commit 308a46c
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 34 deletions.
18 changes: 5 additions & 13 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,13 @@ language: php

before_install:
- sh -c "if [ $TRAVIS_PHP_VERSION != hhvm ]; then echo 'sendmail_path = /bin/true' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi"
- composer self-update
- composer global require --no-update hirak/prestissimo:@stable
- composer global update
- travis_retry composer self-update
- travis_retry composer global require --no-update hirak/prestissimo:@stable
- travis_retry composer global update
- export PATH="$PATH:$HOME/.composer/vendor/bin"

install:
- sh -c "if [ '$SYMFONY_DEPS_VERSION' = '2.8' ]; then sed -i 's/~2.8|~3.0/2.8.*@dev/g' composer.json; composer update; fi"
- sh -c "if [ '$SYMFONY_DEPS_VERSION' = '3.0' ]; then sed -i 's/~2.8|~3.0/3.0.*@dev/g' composer.json; composer update; fi"
- composer install --prefer-source
- travis_retry composer install --prefer-source

before_script:
- mkdir -p build/logs
Expand All @@ -26,19 +24,13 @@ script:
- composer phpunit

after_script:
- composer coveralls
- travis_retry composer coveralls

matrix:
include:
- php: 5.6
- php: 5.6
env: SYMFONY_DEPS_VERSION=2.8
- php: 5.6
env: SYMFONY_DEPS_VERSION=3.0
- php: 7.0
- php: 7.1
- php: hhvm
allow_failures:
- php: 7.0
- php: 7.1
- php: hhvm
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Here is a minimal example of a `composer.json`:

{
"require": {
"authbucket/oauth2-php": "~4.2"
"authbucket/oauth2-php": "~5.0"
}
}

Expand Down Expand Up @@ -163,7 +163,7 @@ The demo is based on [Silex](http://silex.sensiolabs.org/) and [AuthBucketOAuth2

You may also run the demo locally. Open a console and execute the following command to install the latest version in the `oauth2-php` directory:

$ composer create-project authbucket/oauth2-php authbucket/oauth2-php "~4.2"
$ composer create-project authbucket/oauth2-php authbucket/oauth2-php "~5.0"

Then use the PHP built-in web server to run the demo application:

Expand Down
34 changes: 17 additions & 17 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
"description": "The standard compliant OAuth2.0 library based on the Symfony Components",
"extra": {
"branch-alias": {
"dev-develop": "4.x-dev",
"dev-master": "4.2.x-dev"
"dev-develop": "5.x-dev",
"dev-master": "5.0.x-dev"
}
},
"homepage": "https://github.com/authbucket/oauth2-php",
Expand All @@ -35,14 +35,14 @@
"license": "MIT",
"name": "authbucket/oauth2-php",
"require": {
"guzzlehttp/guzzle": "~6.0",
"guzzlehttp/guzzle": "~6.2",
"lib-openssl": "*",
"php": ">=5.5.9",
"psr/log": "~1.0",
"symfony/http-foundation": "~2.8|~3.0",
"symfony/http-kernel": "~2.8|~3.0",
"symfony/security": "~2.8|~3.0",
"symfony/validator": "~2.8|~3.0"
"symfony/http-foundation": "~3.2",
"symfony/http-kernel": "~3.2",
"symfony/security": "~3.2",
"symfony/validator": "~3.2"
},
"require-dev": {
"doctrine/data-fixtures": "~1.0",
Expand All @@ -53,16 +53,16 @@
"phpunit/phpunit": "~5.7",
"satooshi/php-coveralls": "~1.0",
"silex/silex": "~2.1",
"symfony/browser-kit": "~2.8|~3.0",
"symfony/config": "~2.8|~3.0",
"symfony/css-selector": "~2.8|~3.0",
"symfony/finder": "~2.8|~3.0",
"symfony/form": "~2.8|~3.0",
"symfony/phpunit-bridge": "~2.8|~3.0",
"symfony/process": "~2.8|~3.0",
"symfony/translation": "~2.8|~3.0",
"symfony/twig-bridge": "~2.8|~3.0",
"twig/twig": "~1.27|~2.0"
"symfony/browser-kit": "~3.2",
"symfony/config": "~3.2",
"symfony/css-selector": "~3.2",
"symfony/finder": "~3.2",
"symfony/form": "~3.2",
"symfony/phpunit-bridge": "~3.2",
"symfony/process": "~3.2",
"symfony/translation": "~3.2",
"symfony/twig-bridge": "~3.2",
"twig/twig": "~2.0"
},
"scripts": {
"coveralls": "coveralls -v",
Expand Down
4 changes: 2 additions & 2 deletions tests/TestBundle/Resources/views/index.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<p>Here is a minimal example of a <code>composer.json</code>:</p>
<pre><code class="json">{
&quot;require&quot;: {
&quot;authbucket/oauth2-php&quot;: &quot;~4.2&quot;
&quot;authbucket/oauth2-php&quot;: &quot;~5.0&quot;
}
}</code></pre>

Expand Down Expand Up @@ -142,7 +142,7 @@ $app[&#39;security.firewalls&#39;] = [
<h2 id="demo" class="page-header">Demo</h2>
<p class="lead">The demo is based on <a href="http://silex.sensiolabs.org/">Silex</a> and <a href="https://github.com/authbucket/oauth2-php/blob/master/src/Silex/Provider/AuthBucketOAuth2ServiceProvider.php">AuthBucketOAuth2ServiceProvider</a>. Read though <a href="http://oauth2-php.authbucket.com/demo">Demo</a> for more information.</p>
<p>You may also run the demo locally. Open a console and execute the following command to install the latest version in the <code>oauth2-php</code> directory:</p>
<pre><code class="bash">$ composer create-project authbucket/oauth2-php authbucket/oauth2-php &quot;~4.2&quot;</code></pre>
<pre><code class="bash">$ composer create-project authbucket/oauth2-php authbucket/oauth2-php &quot;~5.0&quot;</code></pre>
<p>Then use the PHP built-in web server to run the demo application:</p>
<pre><code class="bash">$ cd authbucket/oauth2-php
$ ./bin/console server:run</code></pre>
Expand Down

0 comments on commit 308a46c

Please sign in to comment.