Skip to content

Commit

Permalink
Follow up with oauth2-php 3.x-dev.
Browse files Browse the repository at this point in the history
  • Loading branch information
hswong3i committed Jul 15, 2015
1 parent a03ab3e commit 5c1a5d7
Show file tree
Hide file tree
Showing 102 changed files with 630 additions and 1,647 deletions.
16 changes: 13 additions & 3 deletions .php-cs-fixer.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
<?php

return Symfony\CS\Config\Config::create()->finder(Symfony\CS\Finder\DefaultFinder::create()
$fixers = array(
'-psr0',
'-no_empty_lines_after_phpdocs',
);

$finder = Symfony\CS\Finder\DefaultFinder::create()
->exclude('app/cache')
->exclude('app/log')
->exclude('build')
Expand All @@ -10,5 +15,10 @@
->notName('LICENSE')
->notName('README.md')
->notName('composer.*')
->notName('phpunit.xml*')
);
->notName('phpunit.xml*');

return Symfony\CS\Config\Config::create()
->level(Symfony\CS\FixerInterface::SYMFONY_LEVEL)
->setUsingCache(false)
->fixers($fixers)
->finder($finder);
6 changes: 1 addition & 5 deletions .sami.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,7 @@
->files()
->name('*.php')
->exclude('Resources')
->exclude('Tests')
->exclude('app')
->exclude('build')
->exclude('vendor')
->in($dir = '.');
->in($dir = 'src');

$versions = GitVersionCollection::create($dir)
->add('develop', 'develop branch')
Expand Down
18 changes: 12 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,20 +1,26 @@
language: php

php:
- 5.3
- 5.4
- 5.5
- 5.6
- hhvm
- nightly

before_script:
- echo 'memory_limit = -1' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
before_install:
- composer self-update

install:
- composer install --dev --prefer-source

before_script:
- mkdir -p build/logs
- rm -rf app/cache/*/*

script:
- vendor/bin/phpunit -c phpunit.xml.dist --coverage-clover ./build/logs/clover.xml
- vendor/bin/phpunit -c phpunit.xml.dist

after_script:
- php vendor/bin/coveralls -v
- vendor/bin/coveralls -v

matrix:
allow_failures:
Expand Down
43 changes: 0 additions & 43 deletions Controller/AuthorizeController.php

This file was deleted.

43 changes: 0 additions & 43 deletions Controller/ClientController.php

This file was deleted.

43 changes: 0 additions & 43 deletions Controller/ScopeController.php

This file was deleted.

124 changes: 0 additions & 124 deletions Resources/config/routing.yml

This file was deleted.

Loading

0 comments on commit 5c1a5d7

Please sign in to comment.