Skip to content
Permalink
Browse files

Merge pull request #147 from kubawerlos/move-src-dev-to-dev-tools

Move src-dev to dev-tools
  • Loading branch information...
kubawerlos committed Sep 29, 2019
2 parents d874d25 + ad02190 commit 92bfba4c2c8bee2f852689379b3c163af6e10244
@@ -1,5 +1,4 @@
/dev-tools/ export-ignore
/src-dev/ export-ignore
/tests/ export-ignore
/.* export-ignore
/infection.json.dist export-ignore
@@ -7,12 +7,12 @@ return PhpCsFixer\Config::create()
PhpCsFixer\Finder::create()
->files()
->in(__DIR__ . '/src')
->in(__DIR__ . '/src-dev')
->in(__DIR__ . '/dev-tools/src')
->in(__DIR__ . '/tests')
->notName('php-cs-fixer.config.*.php')
->append([
__FILE__,
__DIR__ . '/src-dev/Readme/run',
__DIR__ . '/dev-tools/readme',
])
)
->setRiskyAllowed(true)
@@ -49,6 +49,7 @@ jobs:
./configure
make clean install
echo "extension=pcov.so" > $HOME/.phpenv/versions/$TRAVIS_PHP_VERSION/etc/conf.d/pcov.ini
echo "pcov.directory = ." >> $HOME/.phpenv/versions/$TRAVIS_PHP_VERSION/etc/conf.d/pcov.ini
cd $TRAVIS_BUILD_DIR
install: composer require --dev php-coveralls/php-coveralls
script:
@@ -460,7 +460,7 @@ Request feature or report bug by creating [issue](https://github.com/kubawerlos/

Alternatively, fork the repo, develop your changes, regenerate `README.md`:
```bash
./src-dev/Readme/run > README.md
./dev-tools/readme > README.md
```
make sure all checks pass:
```bash
@@ -17,7 +17,7 @@
},
"autoload": {
"psr-4": {
"PhpCsFixerCustomFixers\\": "src"
"PhpCsFixerCustomFixers\\": "./src"
}
},
"scripts": {
@@ -26,8 +26,8 @@
"composer validate --strict",
"composer normalize --dry-run --working-dir=./dev-tools ./../composer.json",
"./dev-tools/vendor/bin/composer-require-checker check ./composer.json",
"./dev-tools/vendor/bin/phpcs --exclude=Generic.Files.LineLength --report-full --standard=PSR2 ./src ./src-dev ./tests",
"./dev-tools/vendor/bin/types-checker ./src ./src-dev ./tests",
"./dev-tools/vendor/bin/phpcs --exclude=Generic.Files.LineLength --report-full --standard=PSR2 ./src ./dev-tools/src ./tests",
"./dev-tools/vendor/bin/types-checker ./src ./dev-tools/src ./tests",
"PHP_CS_FIXER_FUTURE_MODE=1 ./vendor/bin/php-cs-fixer fix --ansi --diff --dry-run --verbose",
"./dev-tools/vendor/bin/phpcpd ./src",
"./dev-tools/vendor/bin/phpmd ./src text ./phpmd.xml",
@@ -37,8 +37,8 @@
"fix": [
"composer normalize --working-dir=./dev-tools ./../composer.json",
"PHP_CS_FIXER_FUTURE_MODE=1 ./vendor/bin/php-cs-fixer fix --ansi --verbose",
"./dev-tools/vendor/bin/phpcbf --exclude=Generic.Files.LineLength --report-full --standard=PSR2 ./src ./src-dev ./tests",
"./src-dev/Readme/run > README.md"
"./dev-tools/vendor/bin/phpcbf --exclude=Generic.Files.LineLength --report-full --standard=PSR2 ./src ./dev-tools/src ./tests",
"./dev-tools/readme > README.md"
],
"infection": [
"./dev-tools/vendor/bin/infection run --ansi --threads=16"
@@ -33,7 +33,7 @@
},
"autoload-dev": {
"psr-4": {
"PhpCsFixerCustomFixersDev\\": "../src-dev",
"PhpCsFixerCustomFixersDev\\": "./src",
"Tests\\": "../tests"
}
}
@@ -1,7 +1,7 @@
#!/usr/bin/env php
<?php
require_once __DIR__ . '/../../dev-tools/vendor/autoload.php';
require_once __DIR__ . '/vendor/autoload.php';
$application = new Symfony\Component\Console\Application();
$command = new PhpCsFixerCustomFixersDev\Readme\ReadmeCommand('readme');
@@ -105,7 +105,7 @@ private function badge(string $description, string $imageUrl, ?string $targetUrl
private function numberOfTests(): int
{
$process = new Process([__DIR__ . '/../../dev-tools/vendor/bin/phpunit', '--list-tests']);
$process = new Process([__DIR__ . '/../../vendor/bin/phpunit', '--list-tests']);
$process->run();
return \substr_count($process->getOutput(), PHP_EOL) - 3; // 3 is for header
@@ -270,6 +270,6 @@ private function contributing(): string
private function composer(): \stdClass
{
return \json_decode(\file_get_contents(__DIR__ . '/../../composer.json'));
return \json_decode(\file_get_contents(__DIR__ . '/../../../composer.json'));
}
}
@@ -2,7 +2,7 @@
"source": {
"directories": [
"src",
"src-dev"
"dev-tools/src"
]
},
"timeout": 10,
@@ -38,11 +38,11 @@

<filter>
<whitelist>
<directory>src</directory>
<directory>src-dev</directory>
<directory>./src</directory>
<directory>./dev-tools/src</directory>
<exclude>
<file>src-dev/Readme/php-cs-fixer.config.after.php</file>
<file>src-dev/Readme/php-cs-fixer.config.before.php</file>
<file>./dev-tools/src/Readme/php-cs-fixer.config.after.php</file>
<file>./dev-tools/src/Readme/php-cs-fixer.config.before.php</file>
</exclude>
</whitelist>
</filter>
@@ -5,11 +5,11 @@
xsi:schemaLocation='https://getpsalm.org/schema/config dev-tools/vendor/vimeo/psalm/config.xsd'
>
<projectFiles>
<directory name='src' />
<directory name='src-dev' />
<directory name='./src' />
<directory name='./dev-tools/src' />
<ignoreFiles>
<file name='src-dev/Readme/php-cs-fixer.config.after.php' />
<file name='src-dev/Readme/php-cs-fixer.config.before.php' />
<file name='./dev-tools/src/Readme/php-cs-fixer.config.after.php' />
<file name='./dev-tools/src/Readme/php-cs-fixer.config.before.php' />
</ignoreFiles>
</projectFiles>

0 comments on commit 92bfba4

Please sign in to comment.
You can’t perform that action at this time.