Skip to content

Commit

Permalink
Downgrade php version dependency
Browse files Browse the repository at this point in the history
  • Loading branch information
steven-pribilinskiy committed Aug 22, 2017
1 parent f248591 commit 42c9b0f
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 6 deletions.
3 changes: 1 addition & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ matrix:
include:

# install vendor packages with lowest version
# - php: 5.4
# env: COMPOSER_ARGS="--prefer-lowest"
- php: 5.6

# install vendor packages with newest version and run Codeception with coverage
- php: 7.1
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
],
"require": {
"maba/dependency-injection-extra": "^0.1.1",
"php": ">=7.0",
"php": ">=5.6",
"satooshi/php-coveralls": "^1.0",
"symfony/console": "^2.5|^3.0",
"symfony/dependency-injection": "^2.6|^3.0",
Expand Down
7 changes: 5 additions & 2 deletions src/Service/AssetManager.php
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,11 @@ private function getManifestEntry($assetName, $exceptionInfo)

if (!isset($this->manifest[$assetName])) {

$assetDescription = $exceptionInfo['assetDescription'] ?? "'$assetName'";
$errorDescription = ($exceptionInfo['errorDescription'] ?? '') . ' Is webpack:dev-server running in the background?';
$assetDescription = isset($exceptionInfo['assetDescription']) ? $exceptionInfo['assetDescription'] : "'$assetName'";

$errorDescription = (isset($exceptionInfo['errorDescription']) ? $exceptionInfo['errorDescription'] : '')
. ' Is webpack:dev-server running in the background?'
;

throw new RuntimeException(
sprintf('No information in manifest for %s. %s', $assetDescription, trim($errorDescription))
Expand Down
2 changes: 1 addition & 1 deletion src/Webpack/Config/WebpackConfigManager.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public function __construct(
AliasProvider $aliasProvider,
AssetCollector $assetCollector,
WebpackConfigDumper $configDumper,
string $configPath,
$configPath,
AssetResolver $assetResolver,
AssetNameGenerator $assetNameGenerator,
ErrorHandlerInterface $errorHandler
Expand Down

0 comments on commit 42c9b0f

Please sign in to comment.