Skip to content

Commit

Permalink
Use sllh/styleci-fixers
Browse files Browse the repository at this point in the history
  • Loading branch information
soullivaneuh committed Nov 9, 2015
1 parent 765fedf commit 30d376e
Show file tree
Hide file tree
Showing 11 changed files with 28 additions and 7 deletions.
6 changes: 1 addition & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,7 @@ before_script:
- if [ "$PHP_CS_FIXER_VERSION" != "" ]; then composer require "fabpot/php-cs-fixer:${PHP_CS_FIXER_VERSION}" --no-update; fi;
- composer update --prefer-dist --no-interaction $COMPOSER_FLAGS

script:
- make test
# Nightly builded with https://nightli.es/
# See also: https://github.com/travis-ci/travis-ci/issues/582#issuecomment-124136045
- ./bridge styleci:config:check
script: make test

after_script:
- php vendor/bin/coveralls -v
Expand Down
2 changes: 2 additions & 0 deletions bridge
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
#!/usr/bin/env php
<?php

trigger_error('The bridge console is deprecatad since version 1.4 and will be removed in 2.0', E_USER_DEPRECATED);

require_once 'vendor/autoload.php';

use SLLH\StyleCIBridge\Console\Application;
Expand Down
3 changes: 2 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@
"symfony/config": "~2.3|~3.0",
"symfony/dependency-injection": "~2.3|~3.0",
"symfony/console": "~2.3|~3.0",
"composer/semver": "~1.0"
"composer/semver": "~1.0",
"sllh/styleci-fixers": "~2.3"
},
"require-dev": {
"twig/twig": "~1.22",
Expand Down
2 changes: 1 addition & 1 deletion src/ConfigBridge.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
use Composer\Semver\Semver;
use SLLH\StyleCIBridge\Exception\LevelConfigException;
use SLLH\StyleCIBridge\StyleCI\Configuration;
use SLLH\StyleCIBridge\StyleCI\Fixers;
use SLLH\StyleCIFixers\Fixers;
use Symfony\Component\Config\Definition\Processor;
use Symfony\Component\Console\Formatter\OutputFormatterStyle;
use Symfony\Component\Console\Output\ConsoleOutput;
Expand Down
4 changes: 4 additions & 0 deletions src/Console/Application.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,12 @@
use SLLH\StyleCIBridge\Console\Command\StyleCIConfigUpdateCommand;
use Symfony\Component\Console\Application as BaseApplication;

@trigger_error('The '.__NAMESPACE__.'\Application class is deprecated since 1.4 and will be removed in 2.0.', E_USER_DEPRECATED);

/**
* @author Sullivan Senechal <soullivaneuh@gmail.com>
*
* @deprecated since 1.4, will be removed in 2.0.
*/
class Application extends BaseApplication
{
Expand Down
4 changes: 4 additions & 0 deletions src/Console/Command/StyleCIConfigCheckCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,12 @@
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;

@trigger_error('The '.__NAMESPACE__.'\StyleCIConfigCheckCommand class is deprecated since 1.4 and will be removed in 2.0.', E_USER_DEPRECATED);

/**
* @author Sullivan Senechal <soullivaneuh@gmail.com>
*
* @deprecated since 1.4, will be removed in 2.0.
*/
class StyleCIConfigCheckCommand extends Command
{
Expand Down
4 changes: 4 additions & 0 deletions src/Console/Command/StyleCIConfigUpdateCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,12 @@
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;

@trigger_error('The '.__NAMESPACE__.'\StyleCIConfigUpdateCommand class is deprecated since 1.4 and will be removed in 2.0.', E_USER_DEPRECATED);

/**
* @author Sullivan Senechal <soullivaneuh@gmail.com>
*
* @deprecated since 1.4, will be removed in 2.0.
*/
class StyleCIConfigUpdateCommand extends Command
{
Expand Down
1 change: 1 addition & 0 deletions src/StyleCI/Configuration.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

use Symfony\Component\Config\Definition\Builder\TreeBuilder;
use Symfony\Component\Config\Definition\ConfigurationInterface;
use SLLH\StyleCIFixers\Fixers;

/**
* @author Sullivan Senechal <soullivaneuh@gmail.com>
Expand Down
4 changes: 4 additions & 0 deletions src/StyleCI/Fixers.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,14 @@

namespace SLLH\StyleCIBridge\StyleCI;

@trigger_error('The '.__NAMESPACE__.'\Fixers class is deprecated since 1.4 and will be removed in 2.0. Use SLLH\StyleCIFixers\Fixers instead.', E_USER_DEPRECATED);

/**
* This class was auto-generated from StyleCI/Config repository.
*
* @link https://github.com/StyleCI/Config/blob/master/src/Config.php
*
* @deprecated since 1.4, will be removed in 2.0.
*/
class Fixers
{
Expand Down
1 change: 1 addition & 0 deletions src/StyleCI/Fixers.php.twig
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{# @deprecated since 1.4, will be removed in 2.0 #}
<?php
namespace SLLH\StyleCIBridge\StyleCI;
Expand Down
4 changes: 4 additions & 0 deletions src/StyleCI/FixersGenerator.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,12 @@
use Symfony\CS\Tokenizer\Token;
use Symfony\CS\Tokenizer\Tokens;

@trigger_error('The '.__NAMESPACE__.'\FixersGenerator class is deprecated since 1.4 and will be removed in 2.0.', E_USER_DEPRECATED);

/**
* @author Sullivan Senechal <soullivaneuh@gmail.com>
*
* @deprecated since 1.4, will be removed in 2.0.
*/
final class FixersGenerator
{
Expand Down

0 comments on commit 30d376e

Please sign in to comment.