Skip to content

Commit

Permalink
pr-fix
Browse files Browse the repository at this point in the history
  • Loading branch information
SirDomin committed Apr 22, 2021
1 parent 9864c93 commit d716b22
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 16 deletions.
7 changes: 1 addition & 6 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
node: [10.x]
mysql: [5.7, 8.0]
symfony: [^4.4, ^5.2]
sylius: [~1.8.0, ~1.9.0@beta]
sylius: [~1.8.0, ~1.9.0]

exclude:
-
Expand Down Expand Up @@ -87,11 +87,6 @@ jobs:
restore-keys: |
${{ runner.os }}-php-${{ matrix.php }}-composer-
-
name: Install Sylius version
run: |
composer require "sylius/sylius:${{ matrix.sylius }}" --no-update
-
name: Restrict Symfony version
if: matrix.symfony != ''
Expand Down
3 changes: 1 addition & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"require": {
"php": "^7.3",

"sylius/sylius": "~1.8.0 || ~1.9.0@beta",
"sylius/sylius": "^1.8",
"nyholm/append-query-string": "^0.1.1",
"phpseclib/phpseclib": "^2.0",
"sylius-labs/doctrine-migrations-extra-bundle": "^0.1.3",
Expand Down Expand Up @@ -44,7 +44,6 @@
},
"conflict": {
"symfony/doctrine-bridge": "4.4.16",
"symplify/package-builder": "^8.3.24",
"doctrine/doctrine-bundle": "2.3.0"
},
"autoload": {
Expand Down
12 changes: 4 additions & 8 deletions tests/Application/Kernel.php
Original file line number Diff line number Diff line change
Expand Up @@ -115,22 +115,18 @@ private function loadRoutesConfiguration(RouteCollectionBuilder $routes, string
$routes->import($confDir . '/{routes}' . self::CONFIG_EXTS, '/', 'glob');
}

/**
* @return BundleInterface[]
*/
/** @return BundleInterface[] */
private function registerBundlesFromFile(string $bundlesFile): iterable
{
$contents = require $bundlesFile;
foreach ($contents as $class => $envs) {
if (isset($envs['all']) || isset($envs[$this->environment])) {
foreach ($contents as $class => $environments) {
if (isset($environments['all']) || isset($environments[$this->environment])) {
yield new $class();
}
}
}

/**
* @return string[]
*/
/** @return string[] */
private function getConfigurationDirectories(): iterable
{
yield $this->getProjectDir() . '/config';
Expand Down

0 comments on commit d716b22

Please sign in to comment.