Skip to content

Commit

Permalink
Fix build
Browse files Browse the repository at this point in the history
  • Loading branch information
veewee committed Jan 7, 2016
1 parent 37e298e commit cfe0c40
Show file tree
Hide file tree
Showing 7 changed files with 47 additions and 30 deletions.
4 changes: 1 addition & 3 deletions .gitignore
@@ -1,5 +1,3 @@
vendor/
.idea
composer.phar
composer.lock
atlassian-ide-plugin.xml
composer.lock
4 changes: 2 additions & 2 deletions .php_cs
Expand Up @@ -4,8 +4,8 @@ $finder = Symfony\CS\Finder\DefaultFinder::create()
->exclude('config')
->in(__DIR__ . '/src')
->in(__DIR__ . '/test')
->notName('phpunit.xml')
->notName('atlassian-ide-plugin.xml');
->name('*.php')
;

$config = Symfony\CS\Config\Config::create();
$config->fixers(Symfony\CS\FixerInterface::PSR2_LEVEL);
Expand Down
24 changes: 16 additions & 8 deletions .travis.yml
@@ -1,21 +1,29 @@
language: php
php:
- 5.5
- 5.4
- 5.3
- hhvm

matrix:
allow_failures:
- php: hhvm
include:
- php: 5.3
- php: 5.3
env: DEPENDENCIES='low'
- php: 5.4
- php: 5.5
- php: 5.6
- php: 5.6
env: DEPENDENCIES='low'
- php: 7.0
fast_finish: true

before_script:
- phpenv config-add .travis-config.ini
- composer self-update
- composer install --dev --prefer-source

install:
- if [ "$DEPENDENCIES" != "low" ]; then composer update --prefer-dist --no-scripts --no-interaction; fi;
- if [ "$DEPENDENCIES" == "low" ]; then composer update --prefer-lowest --no-scripts --no-interaction; fi;

# Add PSR-4 support when https://github.com/fabpot/PHP-CS-Fixer/issues/311 is solved
script:
- ./vendor/bin/grumphp run
- ./vendor/bin/php-cs-fixer fix . --dry-run --fixers=-psr0
- ./vendor/bin/phpunit

Expand Down
31 changes: 16 additions & 15 deletions composer.json
Expand Up @@ -3,9 +3,9 @@
"license": "MIT",
"description": "Doctrine hydrators for ZF2",
"keywords": [
"zf2",
"doctrine",
"hydrator"
"zf2",
"doctrine",
"hydrator"
],
"authors": [
{
Expand All @@ -14,20 +14,21 @@
}
],
"require": {
"php": ">=5.3.23",
"doctrine/common": ">=2.1",
"zendframework/zend-modulemanager": "2.*",
"zendframework/zend-servicemanager": "2.*",
"zendframework/zend-stdlib": "2.*",
"doctrine/doctrine-module": ">=0.8.0",
"doctrine/instantiator": "~1.0.4"
"php": ">=5.3.23",
"doctrine/common": "~2.1",
"zendframework/zend-modulemanager": "~2.0",
"zendframework/zend-servicemanager": "~2.0",
"zendframework/zend-stdlib": "~2.0 <2.7",
"doctrine/doctrine-module": "~0.8",
"doctrine/instantiator": "~1.0.4"
},
"require-dev": {
"fabpot/PHP-CS-Fixer": "*",
"phpunit/phpunit": "*",
"doctrine/doctrine-orm-module": "*",
"doctrine/doctrine-mongo-odm-module": "*",
"doctrine/mongodb-odm": "@dev"
"fabpot/PHP-CS-Fixer": "~1.10",
"phpunit/phpunit": "~5.1",
"doctrine/doctrine-orm-module": "~0.9",
"doctrine/doctrine-mongo-odm-module": "~0.9",
"doctrine/mongodb-odm": "~1.0",
"phpro/grumphp": "~0.7"
},
"autoload": {
"psr-4": {
Expand Down
2 changes: 1 addition & 1 deletion config/module.config.php
Expand Up @@ -28,4 +28,4 @@
'Phpro\DoctrineHydrationModule\Service\DoctrineHydratorFactory',
),
),
);
);
10 changes: 10 additions & 0 deletions grumphp.yml
@@ -0,0 +1,10 @@
parameters:
git_dir: .
bin_dir: ./vendor/bin
tasks:
phpcsfixer:
config_file: ~
level: psr2
fixers:
- "-psr0" # Codebase is PSR 4
phpunit: ~
2 changes: 1 addition & 1 deletion test/config/module.config.php
Expand Up @@ -18,4 +18,4 @@
),
),
),
);
);

0 comments on commit cfe0c40

Please sign in to comment.