Skip to content

Commit

Permalink
DevKit updates for 2.x branch (#255)
Browse files Browse the repository at this point in the history
* DevKit updates

* Applied fixes from FlintCI (#256)
  • Loading branch information
SonataCI authored and greg0ire committed Dec 4, 2018
1 parent 6086b4d commit 03888e5
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 8 deletions.
1 change: 1 addition & 0 deletions .flintci.yml
Expand Up @@ -2,3 +2,4 @@ services:
composernormalize: true
phpcsfixer: true
yamllint: true
xmllint: true
7 changes: 3 additions & 4 deletions .github/PULL_REQUEST_TEMPLATE.md
@@ -1,4 +1,7 @@
<!-- THE PR TEMPLATE IS NOT AN OPTION. DO NOT DELETE IT, MAKE SURE YOU READ AND EDIT IT! -->
## Subject

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

<!--
Show us you choose the right branch.
Expand Down Expand Up @@ -56,7 +59,3 @@ Closes #{put_issue_number_here}
- [ ] Update the documentation
- [ ] Add an upgrade note
-->

## Subject

<!-- Describe your Pull Request content here -->
6 changes: 2 additions & 4 deletions tests/autoload.php.dist
Expand Up @@ -2,11 +2,9 @@

// if the bundle is within a symfony project, try to reuse the project's autoload

$files = array(
$files = [
__DIR__.'/../vendor/autoload.php',
__DIR__.'/../../../../app/autoload.php',
__DIR__.'/../../../../apps/autoload.php',
);
];

$autoload = false;
foreach ($files as $file) {
Expand Down
19 changes: 19 additions & 0 deletions tests/bootstrap.php
Expand Up @@ -9,8 +9,27 @@
* file that was distributed with this source code.
*/

/*
* fix encoding issue while running text on different host with different locale configuration
*/
setlocale(LC_ALL, 'en_US.UTF-8');

if (file_exists($file = __DIR__.'/autoload.php')) {
require_once $file;
} elseif (file_exists($file = __DIR__.'/autoload.php.dist')) {
require_once $file;
}

/*
* try to get Symfony's PHPUnit Bridge
*/
$files = array_filter([
__DIR__.'/../vendor/symfony/symfony/src/Symfony/Bridge/PhpUnit/bootstrap.php',
__DIR__.'/../vendor/symfony/phpunit-bridge/bootstrap.php',
__DIR__.'/../../../../vendor/symfony/symfony/src/Symfony/Bridge/PhpUnit/bootstrap.php',
__DIR__.'/../../../../vendor/symfony/phpunit-bridge/bootstrap.php',
], 'file_exists');

if ($files) {
require_once current($files);
}

0 comments on commit 03888e5

Please sign in to comment.