Skip to content

Commit

Permalink
DevKit updates
Browse files Browse the repository at this point in the history
  • Loading branch information
SonataCI committed May 8, 2016
1 parent 01b447e commit d32e0e6
Show file tree
Hide file tree
Showing 9 changed files with 261 additions and 168 deletions.
23 changes: 23 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
root = true

[*]
end_of_line = lf
indent_style = space
charset = utf-8
insert_final_newline = true
trim_trailing_whitespace = true

[*.{yml,twig,php}]
indent_size = 4

[*.{js,json,scss,css}]
indent_size = 2

[.travis-ci.yml]
indent_size = 2

[composer.json]
indent_size = 4

[Makefile]
indent_style = tab
8 changes: 4 additions & 4 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
Delete this sentence after you read the "Reporting bugs" paragraph from the
Delete this sentence after you read the "Issues" paragraph from the
"guidelines for contributing" link above.

If you are reporting a bug, please try to fill in the following, otherwise
remove it along with this sentence.

| Question | Answer
|----------------|-------------------------------------------------------------
| Bundle version | composer show --installed | grep sonata-project/admin-bundle
| Symfony version| composer show --installed | grep symfony/symfony
|----------------|-------------------------------
| Bundle version | composer show sonata-project/*
| Symfony version| composer show symfony/*
| php version | php --version

# Error message
Expand Down
8 changes: 8 additions & 0 deletions .php_cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
<?php

/*
* DO NOT EDIT THIS FILE!
*
* It's auto-generated by sonata-project/dev-kit package.
*
* Package `sllh/php-cs-fixer-styleci-bridge` is required to get it working.
*/

require_once __DIR__.'/vendor/sllh/php-cs-fixer-styleci-bridge/autoload.php';

use SLLH\StyleCIBridge\ConfigBridge;
Expand Down
15 changes: 12 additions & 3 deletions .styleci.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,26 @@
# DO NOT EDIT THIS FILE!
#
# It's auto-generated by sonata-project/dev-kit package.
#
# Package `sllh/php-cs-fixer-styleci-bridge` is required to get it working.

preset: symfony

enabled:
- align_double_arrow
- newline_after_open_tag
- ordered_use
- long_array_syntax
- php_unit_construct
- php_unit_strict
# Comment strict rules for the moment. Should be uncomment later to see StyleCI PR results
# - strict
# - strict_param
# - php_unit_construct
# - php_unit_strict

disabled:
- unalign_double_arrow
- unalign_equals

finder:
exclude:
- Tests/Fixtures
- 'Tests/Fixtures'
66 changes: 37 additions & 29 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,61 +1,69 @@
# DO NOT EDIT THIS FILE!
#
# It's auto-generated by sonata-project/dev-kit package.

language: php

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

sudo: false

cache:
directories:
- $HOME/.composer/cache/files
- $HOME/.cache/pip

env:
global:
- PATH="$HOME/.composer/vendor/bin:$PATH"
- PATH="$HOME/.composer/vendor/bin:$HOME/.local/bin:$PATH"
- SYMFONY_DEPRECATIONS_HELPER=weak
- TARGET=test

matrix:
fast_finish: true
include:
- php: 7.0
- php: '7.0'
env: TARGET=docs
- php: 5.3
env: COMPOSER_FLAGS="--prefer-lowest --prefer-stable"
- php: 7.0
- php: 5.6
- php: '5.3'
env: COMPOSER_FLAGS="--prefer-lowest"
- php: '7.0'
env: SYMFONY_VERSION=2.3.*
- php: 5.6
- php: '7.0'
env: SYMFONY_VERSION=2.6.*
- php: '7.0'
env: SYMFONY_VERSION=2.7.*
- php: 5.6
- php: '7.0'
env: SYMFONY_VERSION=2.8.*
- php: 5.5
- php: '7.0'
env: SYMFONY_VERSION=3.0.*
- php: 5.6
env: SYMFONY_VERSION=3.0.*
- php: 7.0
env: SYMFONY_VERSION=3.0.*

- php: '7.0'
env: SYMFONY_VERSION=dev-master@dev
- php: '7.0'
env: SYMFONY_DEPRECATIONS_HELPER=0
allow_failures:
- php: hhvm
- php: nightly
- php: hhvm
- env: SYMFONY_DEPRECATIONS_HELPER=0
- env: SYMFONY_VERSION=dev-master@dev

before_script:
- (phpenv config-rm xdebug.ini || exit 0)
- mkdir -p ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d && echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
- composer selfupdate
- composer config -q -g github-oauth.github.com $GITHUB_OAUTH_TOKEN
- composer global require phpunit/phpunit:@stable fabpot/php-cs-fixer --no-update
- composer global update --prefer-dist --no-interaction
before_install:
- if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then mv "$HOME/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini" /tmp; fi;
- composer config --quiet --global github-oauth.github.com $GITHUB_OAUTH_TOKEN
- composer global require phpunit/phpunit:@stable --no-update
- if [ "$SYMFONY_VERSION" != "" ]; then composer require "symfony/symfony:${SYMFONY_VERSION}" --no-update; fi;

install:
- travis_wait composer global update --prefer-dist --no-interaction
- travis_wait composer update --prefer-dist --no-interaction $COMPOSER_FLAGS
- export PATH=$HOME/.local/bin:$PATH
- pip install -r Resources/doc/requirements.txt --user `whoami`

script:
- make $TARGET
before_script:
- if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then mv /tmp/xdebug.ini "$HOME/.phpenv/versions/$(phpenv version-name)/etc/conf.d"; fi;

notifications:
webhooks: https://sonata-project.org/bundles/admin/master/travis
script: make $TARGET
Loading

0 comments on commit d32e0e6

Please sign in to comment.