Merge pull request #43 from Kdecherf/composer-bump

Composer bump, php-cs bump to v2, travis update
pull/44/head
Jérémy Benoist 7 years ago committed by GitHub
commit db4508003b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 33
      .php_cs
  2. 17
      .travis.yml
  3. 10
      composer.json

@ -1,20 +1,25 @@
<?php <?php
return Symfony\CS\Config\Config::create() return PhpCsFixer\Config::create()
->setUsingCache(true) ->setUsingCache(true)
->level(Symfony\CS\FixerInterface::SYMFONY_LEVEL) ->setRiskyAllowed(true)
// use default SYMFONY_LEVEL and extra fixers: ->setRules([
->fixers(array( 'concat_space' => [
'concat_with_spaces', 'spacing' => 'one',
'ordered_use', ],
'phpdoc_order', 'ordered_imports' => true,
'strict', 'phpdoc_order' => true,
'strict_param', 'strict_comparison' => true,
'long_array_syntax', 'strict_param' => true,
)) 'array_syntax' => [
->finder( 'syntax' => 'long',
Symfony\CS\Finder\DefaultFinder::create() ],
])
->setFinder(
PhpCsFixer\Finder::create()
->exclude([
'vendor',
])
->in(__DIR__) ->in(__DIR__)
->exclude(array('vendor'))
) )
; ;

@ -1,7 +1,6 @@
language: php language: php
php: php:
- 5.5
- 5.6 - 5.6
- 7.0 - 7.0
- 7.1 - 7.1
@ -11,20 +10,10 @@ php:
matrix: matrix:
include: include:
- php: 5.3.3 - php: 7.2
dist: precise
sudo: required
- php: 5.3
dist: precise
sudo: required
- php: 5.4
dist: precise
sudo: required
- php: 7.0
env: CS_FIXER=run env: CS_FIXER=run
fast_finish: true fast_finish: true
allow_failures: allow_failures:
- php: 7.3
- php: nightly - php: nightly
# cache vendor dirs # cache vendor dirs
@ -35,10 +24,6 @@ cache:
before_install: before_install:
- if [ -n "$GH_TOKEN" ]; then composer config github-oauth.github.com ${GH_TOKEN}; fi; - if [ -n "$GH_TOKEN" ]; then composer config github-oauth.github.com ${GH_TOKEN}; fi;
# disable TLS for composer because openssl is disabled for PHP 5.3.3 on travis
# see: https://blog.travis-ci.com/upcoming_ubuntu_11_10_migration/
- if [[ $TRAVIS_PHP_VERSION = 5.3.3 ]]; then composer config -g -- disable-tls true; fi;
- if [[ $TRAVIS_PHP_VERSION = 5.3.3 ]]; then composer config -g -- secure-http false; fi;
install: install:
- composer self-update - composer self-update

@ -24,16 +24,16 @@
"role": "Developer (original JS version)" "role": "Developer (original JS version)"
}], }],
"require": { "require": {
"php": ">=5.3.3", "php": ">=5.6.0",
"ext-mbstring": "*", "ext-mbstring": "*",
"psr/log": "^1.0", "psr/log": "^1.0",
"electrolinux/php-html5lib": "^0.1.0" "electrolinux/php-html5lib": "^0.1.0"
}, },
"require-dev": { "require-dev": {
"satooshi/php-coveralls": "~0.6", "php-coveralls/php-coveralls": "^2.1",
"friendsofphp/php-cs-fixer": "<2", "friendsofphp/php-cs-fixer": "^2.14",
"monolog/monolog": "^1.13", "monolog/monolog": "^1.24",
"symfony/phpunit-bridge": "^3.2" "symfony/phpunit-bridge": "^4.2.3"
}, },
"suggest": { "suggest": {
"ext-tidy": "Used to clean up given HTML and to avoid problems with bad HTML structure." "ext-tidy": "Used to clean up given HTML and to avoid problems with bad HTML structure."

Loading…
Cancel
Save