Skip to content

Commit

Permalink
Merge pull request #25 from spryker/feature/te-4544/master/update-mon…
Browse files Browse the repository at this point in the history
…olog-monolog

te-4544 Update monolog/monolog
  • Loading branch information
tamasnyulas authored Jan 23, 2020
2 parents 96a23fe + d006b43 commit 6be2d89
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 34 deletions.
5 changes: 3 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,13 @@ matrix:
fast_finish: true

before_script:
- composer install --prefer-dist --no-interaction
- if [[ $PREFER_LOWEST != 1 ]]; then COMPOSER_MEMORY_LIMIT=-1 composer install --prefer-dist --no-interaction ; fi
- if [[ $PREFER_LOWEST == 1 ]]; then COMPOSER_MEMORY_LIMIT=-1 composer update --prefer-dist --no-interaction --prefer-lowest --prefer-stable ; fi

script:
- if [[ ${TRAVIS_PHP_VERSION} == "7.4" ]] ; then vendor/bin/codecept run ; fi
- if [[ ${TRAVIS_PHP_VERSION} != "7.4" ]] ; then vendor/bin/codecept run --coverage-xml ; fi
- if [[ $CHECKS == 1 ]] ; then vendor/bin/phpstan analyse -l 7 -c phpstan.neon src/ ; fi
- if [[ $CHECKS == 1 ]] ; then vendor/bin/phpstan analyse -l 5 -c phpstan.neon src/ ; fi
- if [[ $CHECKS == 1 ]] ; then composer cs-check ; fi

notifications:
Expand Down
10 changes: 2 additions & 8 deletions codeception.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ paths:
support: tests/_support
envs: tests/_envs

bootstrap: _bootstrap.php

settings:
bootstrap: _bootstrap.php
suite_class: \PHPUnit_Framework_TestSuite
colors: true
memory_limit: 1024M
log: true
Expand All @@ -24,12 +24,6 @@ suites:
Console:
path: SprykerTest/Console
class_name: ConsoleTester
modules:
enabled:
- Asserts
Install:
path: SprykerTest/Install
class_name: InstallTester
modules:
enabled:
- Asserts
16 changes: 8 additions & 8 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,18 @@
"license": "MIT",
"require": {
"php": ">=7.2",
"symfony/console": "^3.0.0 || ^4.0.0",
"symfony/process": "^3.0.0 || ^4.0.0",
"symfony/yaml": "^3.0.0 || ^4.0.0",
"monolog/monolog": "^1.23"
"symfony/console": "^3.3.0 || ^4.0.0 || ^5.0.0",
"symfony/process": "^3.3.0 || ^4.0.0 || ^5.0.0",
"symfony/yaml": "^3.0.0 || ^4.0.0 || ^5.0.0",
"monolog/monolog": "^1.23 || ^2.0.0"
},
"require-dev": {
"codeception/codeception": "*",
"codeception/codeception": "^4.0.0",
"symfony/var-dumper": "*",
"phpstan/phpstan": "^0.11.2",
"phpstan/phpstan": "^0.12.0",
"spryker/code-sniffer": "*",
"php-coveralls/php-coveralls": "^1.0",
"phpunit/phpunit": "<8"
"php-coveralls/php-coveralls": "*",
"sllh/composer-versions-check": "*"
},
"autoload": {
"psr-4": {
Expand Down
4 changes: 0 additions & 4 deletions phpstan.neon
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@ parameters:
bootstrap: %rootDir%/../../../phpstan-bootstrap.php

ignoreErrors:
-
message: '#Call to function method_exists\(\) with#'
path: %currentWorkingDirectory%/src/Spryker/Install/Executable/CommandLine/CommandLineExecutable.php

-
message: '#Parameter \#1 \$command of class Symfony\\Component\\Process\\Process constructor expects array, string given.#'
path: %currentWorkingDirectory%/src/Spryker/Install/Executable/CommandLine/CommandLineExecutable.php
13 changes: 4 additions & 9 deletions src/Spryker/Console/InstallConsoleCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -75,11 +75,6 @@ class InstallConsoleCommand extends Command
*/
protected $configuration;

/**
* @var array
*/
protected $commandExitCodes = [];

/**
* @return void
*/
Expand Down Expand Up @@ -194,31 +189,31 @@ protected function getCommandLineOptionContainer(): CommandLineOptionContainer
}

/**
* @return array
* @return string[]
*/
protected function getSectionsToBeExecuted(): array
{
return $this->getOptionAndComment(static::OPTION_SECTIONS, 'Install will only run this section(s) "%s"');
}

/**
* @return array
* @return string[]
*/
protected function getGroupsToBeExecuted(): array
{
return $this->getOptionAndComment(static::OPTION_GROUPS, 'Install will only run this group(s) "%s"');
}

/**
* @return array
* @return string[]
*/
protected function getExcludedStagesAndExcludedGroups()
{
return $this->getOptionAndComment(static::OPTION_EXCLUDE, 'Install will exclude this group(s) or section(s) "%s"');
}

/**
* @return array
* @return string[]
*/
protected function getIncludeExcluded(): array
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,9 @@ public function __construct(CommandInterface $command, ConfigurationInterface $c
public function execute(StyleInterface $output): int
{
$process = $this->buildProcess();
$process->inheritEnvironmentVariables(true);
if (method_exists($process, 'inheritEnvironmentVariables')) {
$process->inheritEnvironmentVariables(true);
}
$process->start();

foreach ($process as $buffer) {
Expand Down
4 changes: 2 additions & 2 deletions src/Spryker/Style/SprykerStyle.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@

class SprykerStyle implements StyleInterface
{
public const MAX_LINE_LENGTH = 120;

use InputHelper;
use CursorHelper;

public const MAX_LINE_LENGTH = 120;

/**
* @var \Symfony\Component\Console\Output\BufferedOutput
*/
Expand Down

0 comments on commit 6be2d89

Please sign in to comment.