Skip to content

Commit

Permalink
DevKit updates (#525)
Browse files Browse the repository at this point in the history
  • Loading branch information
SonataCI authored and OskarStark committed Dec 6, 2018
1 parent 72f1a2f commit c546bd6
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 27 deletions.
1 change: 1 addition & 0 deletions .flintci.yml
Original file line number Diff line number Diff line change
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
Original file line number Diff line number Diff line change
@@ -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 -->
23 changes: 2 additions & 21 deletions tests/autoload.php.dist
Original file line number Diff line number Diff line change
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 All @@ -27,20 +25,3 @@ Visit http://getcomposer.org/ for more information.

');
}

// Check for symfony 2.7 or higher and disable deprecated errors if found
if (file_exists($file = __DIR__ . '/../../vendor/composer/installed.json')) {
$installedPackages = json_decode(file_get_contents($file), true);
foreach ($installedPackages as $installedPackage) {
if (
strpos($installedPackage['name'], 'symfony/') !== 0 ||
version_compare($installedPackage['version_normalized'], '2.7', '<')
) {
continue;
}

\PHPUnit_Framework_Error_Deprecated::$enabled = false;
break;
}
unset($installedPackages);
}
8 changes: 6 additions & 2 deletions tests/bootstrap.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@
* file that was distributed with this source code.
*/

// fix encoding issue while running text on different host with different locale configuration
/*
* 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')) {
Expand All @@ -18,7 +20,9 @@
require_once $file;
}

// try to get Symfony's PHPUnit Bridge
/*
* 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',
Expand Down

0 comments on commit c546bd6

Please sign in to comment.