Skip to content

Commit

Permalink
DevKit updates
Browse files Browse the repository at this point in the history
  • Loading branch information
SonataCI authored and soullivaneuh committed May 26, 2016
1 parent 49e628e commit ccab89b
Show file tree
Hide file tree
Showing 14 changed files with 498 additions and 106 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.yml]
indent_size = 2

[composer.json]
indent_size = 4

[Makefile]
indent_style = tab
27 changes: 27 additions & 0 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<!--
Before you open an issue, make sure this one does not already exists.
Please also read the "guidelines for contributing" link above before posting.
-->

<!--
If you are reporting a bug, please try to fill in the following.
Otherwise remove it.
-->

| Question | Answer
|----------------|-------------------------------
| Bundle version | composer show sonata-project/*
| Symfony version| composer show symfony/*
| php version | php --version

# Error message

```
Error message goes here
```

# Steps to reproduce

# Expected results

# Actual results
48 changes: 48 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
<!-- THE PR TEMPLATE IS NOT AN OPTION. DO NOT DELETE IT! -->

<!--
Specify which issues will be fixed/closed.
Remove it if this is not related.
-->

Closes #

### Changelog

<!-- MANDATORY
Fill the changelog part inside the code block.
Remove unneeded sections.
Follow this schema: http://keepachangelog.com/
-->

```markdown
### Added
- Added some `Class::newMethod` to do great stuff

### Changed

### Deprecated

### Removed

### Fixed

### Security
```

### Subject

<!-- Describe your Pull Request content here -->

### To do

<!--
Complete the tasks.
You can add as many tasks as you want.
If some are not relevant, just remove them.
-->

- [ ] My PR stuff
- [ ] Update the tests
- [ ] Update the documentation
- [ ] Add an upgrade note
35 changes: 15 additions & 20 deletions .php_cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,18 @@
<?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;
use Symfony\CS\Fixer\Contrib\HeaderCommentFixer;

$header = <<<EOF
This file is part of the Sonata Project package.
Expand All @@ -9,26 +22,8 @@ For the full copyright and license information, please view the LICENSE
file that was distributed with this source code.
EOF;

Symfony\CS\Fixer\Contrib\HeaderCommentFixer::setHeader($header);

$finder = Symfony\CS\Finder\DefaultFinder::create()
->in(array(__DIR__))
->exclude(array('Tests/Fixtures'))
;
HeaderCommentFixer::setHeader($header);

return Symfony\CS\Config\Config::create()
->level(Symfony\CS\FixerInterface::SYMFONY_LEVEL)
->fixers(array(
'header_comment',
'-unalign_double_arrow',
'-unalign_equals',
'align_double_arrow',
'newline_after_open_tag',
'ordered_use',
'long_array_syntax',
'php_unit_construct',
'php_unit_strict',
))
return ConfigBridge::create()
->setUsingCache(true)
->finder($finder)
;
22 changes: 22 additions & 0 deletions .styleci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# 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:
- newline_after_open_tag
- ordered_class_elements
- ordered_use
- long_array_syntax
# Comment strict rules for the moment. Should be uncomment later to see StyleCI PR results
# - strict
# - strict_param
# - php_unit_construct
# - php_unit_strict

finder:
exclude:
- 'Tests/Fixtures'
93 changes: 53 additions & 40 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,64 +1,77 @@
# 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
- $HOME/.cache/pip
- $HOME/.composer/cache/files

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

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

- php: '5.3'
env: COMPOSER_FLAGS="--prefer-lowest"
- php: '5.6'
env: SYMFONY=2.3.*
- php: '5.6'
env: SYMFONY=2.7.*
- php: '5.6'
env: SYMFONY=2.8.*
- php: '5.6'
env: SYMFONY=3.0.*
- php: '5.6'
env: SYMFONY=dev-master@dev
- php: '5.6'
env: DOCTRINE_ODM=1.*
- php: '5.6'
env: DOCTRINE_ODM=dev-master@dev
- php: '5.6'
env: SONATA_CORE=3.*
- php: '5.6'
env: SONATA_CORE=dev-master@dev
- php: '5.6'
env: SONATA_ADMIN=3.*
- php: '5.6'
env: SONATA_ADMIN=dev-master@dev
- php: '7.0'
env: SYMFONY_DEPRECATIONS_HELPER=0
allow_failures:
- php: hhvm
- php: nightly
- php: 7.0
- php: hhvm
- env: SYMFONY_DEPRECATIONS_HELPER=0
- env: SYMFONY=dev-master@dev
- env: DOCTRINE_ODM=dev-master@dev
- env: SONATA_CORE=dev-master@dev
- env: SONATA_ADMIN=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
- echo "extension=mongo.so" >> ~/.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
- if [ "$SYMFONY_VERSION" != "" ]; then composer require "symfony/symfony:${SYMFONY_VERSION}" --no-update; fi;
- 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`
before_install:
- if [ -x .travis/before_install_${TARGET}.sh ]; then .travis/before_install_${TARGET}.sh; fi;

script:
- make $TARGET
install:
- if [ -x .travis/install_${TARGET}.sh ]; then .travis/install_${TARGET}.sh; fi;

before_script:
- if [ -x .travis/before_script_${TARGET}.sh ]; then .travis/before_script_${TARGET}.sh; fi;

notifications:
webhooks: https://sonata-project.org/bundles/media/master/travis
script: make $TARGET
21 changes: 21 additions & 0 deletions .travis/before_install_test.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
#!/usr/bin/env sh
set -ev

if [ "${TRAVIS_PHP_VERSION}" != "hhvm" ]; then
mv "$HOME/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini" /tmp
echo "memory_limit=3072M" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini

if [ ${TRAVIS_PHP_VERSION} '<' '7.0' ]; then
echo "extension=mongo.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
fi
fi

# To be removed when following PR will be merged: https://github.com/travis-ci/travis-build/pull/718
composer self-update --stable
composer config --quiet --global github-oauth.github.com $GITHUB_OAUTH_TOKEN
sed --in-place "s/\"dev-master\":/\"dev-${TRAVIS_COMMIT}\":/" composer.json

if [ "$SYMFONY" != "" ]; then composer require "symfony/symfony:$SYMFONY" --no-update; fi;
if [ "$DOCTRINE_ODM" != "" ]; then composer require "doctrine/mongodb-odm:$DOCTRINE_ODM" --no-update; fi;
if [ "$SONATA_CORE" != "" ]; then composer require "sonata-project/core-bundle:$SONATA_CORE" --no-update; fi;
if [ "$SONATA_ADMIN" != "" ]; then composer require "sonata-project/admin-bundle:$SONATA_ADMIN" --no-update; fi;
6 changes: 6 additions & 0 deletions .travis/before_script_test.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#!/usr/bin/env sh
set -ev

if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then
mv /tmp/xdebug.ini "$HOME/.phpenv/versions/$(phpenv version-name)/etc/conf.d"
fi
4 changes: 4 additions & 0 deletions .travis/install_docs.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/usr/bin/env sh
set -ev

pip install -r Resources/doc/requirements.txt --user $(whoami)
19 changes: 19 additions & 0 deletions .travis/install_test.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
#!/usr/bin/env sh
set -ev

mkdir --parents "${HOME}/bin"

# PHPUnit install
if [ ${TRAVIS_PHP_VERSION} '<' '5.6' ]; then
PHPUNIT_PHAR=phpunit-old.phar
else
PHPUNIT_PHAR=phpunit.phar
fi
wget "https://phar.phpunit.de/${PHPUNIT_PHAR}" --output-document="${HOME}/bin/phpunit"
chmod u+x "${HOME}/bin/phpunit"

# To be removed when this issue will be resolved: https://github.com/composer/composer/issues/5355
if [ "${COMPOSER_FLAGS}" = '--prefer-lowest' ]; then
composer update --prefer-dist --no-interaction --prefer-stable --quiet
fi
composer update --prefer-dist --no-interaction --prefer-stable ${COMPOSER_FLAGS}
Loading

0 comments on commit ccab89b

Please sign in to comment.