mirror of
https://github.com/elyby/php-code-style.git
synced 2024-12-22 13:09:50 +05:30
Fix compatibility with the PHP-CS-Fixer 2.13.3 and above
This commit is contained in:
parent
06a37576ee
commit
3ab60f5bd5
@ -3,6 +3,7 @@ php:
|
|||||||
- '7.0'
|
- '7.0'
|
||||||
- '7.1'
|
- '7.1'
|
||||||
- '7.2'
|
- '7.2'
|
||||||
|
- '7.3'
|
||||||
- nightly
|
- nightly
|
||||||
|
|
||||||
cache:
|
cache:
|
||||||
@ -25,7 +26,7 @@ stages:
|
|||||||
jobs:
|
jobs:
|
||||||
include:
|
include:
|
||||||
- stage: Static Code Analysis
|
- stage: Static Code Analysis
|
||||||
php: 7.2
|
php: 7.3
|
||||||
script:
|
script:
|
||||||
- vendor/bin/php-cs-fixer fix -v --dry-run
|
- vendor/bin/php-cs-fixer fix -v --dry-run
|
||||||
allow_failures:
|
allow_failures:
|
||||||
|
1
composer.lock
generated
1
composer.lock
generated
@ -1887,6 +1887,7 @@
|
|||||||
"mock",
|
"mock",
|
||||||
"xunit"
|
"xunit"
|
||||||
],
|
],
|
||||||
|
"abandoned": true,
|
||||||
"time": "2018-08-07T07:02:44+00:00"
|
"time": "2018-08-07T07:02:44+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -10,10 +10,10 @@ use PhpCsFixer\FixerConfiguration\FixerConfigurationResolver;
|
|||||||
use PhpCsFixer\FixerConfiguration\FixerOptionBuilder;
|
use PhpCsFixer\FixerConfiguration\FixerOptionBuilder;
|
||||||
use PhpCsFixer\FixerDefinition\CodeSample;
|
use PhpCsFixer\FixerDefinition\CodeSample;
|
||||||
use PhpCsFixer\FixerDefinition\FixerDefinition;
|
use PhpCsFixer\FixerDefinition\FixerDefinition;
|
||||||
|
use PhpCsFixer\Preg;
|
||||||
use PhpCsFixer\Tokenizer\Token;
|
use PhpCsFixer\Tokenizer\Token;
|
||||||
use PhpCsFixer\Tokenizer\Tokens;
|
use PhpCsFixer\Tokenizer\Tokens;
|
||||||
use PhpCsFixer\Tokenizer\TokensAnalyzer;
|
use PhpCsFixer\Tokenizer\TokensAnalyzer;
|
||||||
use PhpCsFixer\Utils;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is copy of the PR https://github.com/FriendsOfPHP/PHP-CS-Fixer/pull/3688
|
* This is copy of the PR https://github.com/FriendsOfPHP/PHP-CS-Fixer/pull/3688
|
||||||
@ -142,7 +142,8 @@ new class extends Foo {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// The final bit of the whitespace must be the next statement's indentation
|
// The final bit of the whitespace must be the next statement's indentation
|
||||||
$lines = Utils::splitLines($content);
|
Preg::matchAll('/[^\n\r]+[\r\n]*/', $content, $matches);
|
||||||
|
$lines = $matches[0];
|
||||||
$eol = $this->whitespacesConfig->getLineEnding();
|
$eol = $this->whitespacesConfig->getLineEnding();
|
||||||
$tokens[$index] = new Token([T_WHITESPACE, str_repeat($eol, $countLines + 1) . end($lines)]);
|
$tokens[$index] = new Token([T_WHITESPACE, str_repeat($eol, $countLines + 1) . end($lines)]);
|
||||||
}
|
}
|
||||||
|
@ -7,9 +7,9 @@ use Ely\CS\Fixer\AbstractFixer;
|
|||||||
use PhpCsFixer\Fixer\WhitespacesAwareFixerInterface;
|
use PhpCsFixer\Fixer\WhitespacesAwareFixerInterface;
|
||||||
use PhpCsFixer\FixerDefinition\CodeSample;
|
use PhpCsFixer\FixerDefinition\CodeSample;
|
||||||
use PhpCsFixer\FixerDefinition\FixerDefinition;
|
use PhpCsFixer\FixerDefinition\FixerDefinition;
|
||||||
|
use PhpCsFixer\Preg;
|
||||||
use PhpCsFixer\Tokenizer\Token;
|
use PhpCsFixer\Tokenizer\Token;
|
||||||
use PhpCsFixer\Tokenizer\Tokens;
|
use PhpCsFixer\Tokenizer\Tokens;
|
||||||
use PhpCsFixer\Utils;
|
|
||||||
use SplFileInfo;
|
use SplFileInfo;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -123,7 +123,8 @@ class Foo
|
|||||||
}
|
}
|
||||||
|
|
||||||
// The final bit of the whitespace must be the next statement's indentation
|
// The final bit of the whitespace must be the next statement's indentation
|
||||||
$lines = Utils::splitLines($content);
|
Preg::matchAll('/[^\n\r]+[\r\n]*/', $content, $matches);
|
||||||
|
$lines = $matches[0];
|
||||||
$eol = $this->whitespacesConfig->getLineEnding();
|
$eol = $this->whitespacesConfig->getLineEnding();
|
||||||
$tokens[$index] = new Token([T_WHITESPACE, str_repeat($eol, $countLines + 1) . end($lines)]);
|
$tokens[$index] = new Token([T_WHITESPACE, str_repeat($eol, $countLines + 1) . end($lines)]);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user