Merge pull request #10 from martin-helmich/bugfix/relax-dependencies

Compatibility with newer symfony/* components
martin-helmich · May 8, 2016 · 7bbc470 · 7bbc470
2 parents cdb2549 + 44a215f
commit 7bbc470
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 22 deletions.
diff --git a/composer.json b/composer.json
@@ -18,17 +18,18 @@
  "prefer-stable": true,
  "require": {
  "php": ">=5.4",
- "symfony/console": "~2.7.0",
- "symfony/dependency-injection": "2.4.*",
- "symfony/config": "2.4.*",
- "symfony/yaml": "2.4.*",
- "symfony/finder": "~2.7.0",
- "symfony/event-dispatcher": "~2.4.0",
+ "symfony/console": "~2.7|~3.0",
+ "symfony/dependency-injection": "~2.7|~3.0",
+ "symfony/config": "~2.7|~3.0",
+ "symfony/yaml": "~2.7|~3.0",
+ "symfony/finder": "~2.7|~3.0",
+ "symfony/event-dispatcher": "~2.7",
  "helmich/typo3-typoscript-parser": "~1.0"
  },
  "require-dev": {
  "phpunit/phpunit": "~4.8.0",
- "codeclimate/php-test-reporter": "dev-master"
+ "codeclimate/php-test-reporter": "dev-master",
+ "symfony/phpunit-bridge": "^3.0"
  },
  "bin": [
  "typoscript-lint"

diff --git a/services.yml b/services.yml
@@ -2,28 +2,28 @@ services:
  tokenize_command:
  class: Helmich\TypoScriptLint\Command\TokenizeCommand
  calls:
- - [injectTokenizer, [@tokenizer]]
- - [injectTokenPrinter, [@token_printer_structured]]
+ - [injectTokenizer, ['@tokenizer']]
+ - [injectTokenPrinter, ['@token_printer_structured']]
  lint_command:
  class: Helmich\TypoScriptLint\Command\LintCommand
  calls:
- - [injectLinter, [@linter]]
- - [injectLinterConfigurationLocator, [@linter_configuration_locator]]
- - [injectReportPrinterLocator, [@printer_locator]]
- - [injectFinder, [@finder]]
- - [injectEventDispatcher, [@dispatcher]]
+ - [injectLinter, ['@linter']]
+ - [injectLinterConfigurationLocator, ['@linter_configuration_locator']]
+ - [injectReportPrinterLocator, ['@printer_locator']]
+ - [injectFinder, ['@finder']]
+ - [injectEventDispatcher, ['@dispatcher']]
  parse_command:
  class: Helmich\TypoScriptLint\Command\ParseCommand
  calls:
- - [injectParser, [@parser]]
+ - [injectParser, ['@parser']]
  linter:
  class: Helmich\TypoScriptLint\Linter\Linter
- arguments: [@tokenizer, @parser, @sniff_locator]
+ arguments: ['@tokenizer', '@parser', '@sniff_locator']
  linter_configuration:
  class: Helmich\TypoScriptLint\Linter\LinterConfiguration
  linter_configuration_locator:
  class: Helmich\TypoScriptLint\Linter\Configuration\ConfigurationLocator
- arguments: [@config_loader, @config_processor]
+ arguments: ['@config_loader', '@config_processor']
  printer_locator:
  class: Helmich\TypoScriptLint\Linter\ReportPrinter\PrinterLocator
  sniff_locator:
@@ -36,14 +36,14 @@ services:
  - ['%dir.cwd%', '%dir.tslint_root%']
  config_yaml_loader:
  class: Helmich\TypoScriptLint\Linter\Configuration\YamlConfigurationLoader
- arguments: [@config_locator, @yaml_parser, @filesystem]
+ arguments: ['@config_locator', '@yaml_parser', '@filesystem']
  config_loader_resolver:
  class: Symfony\Component\Config\Loader\LoaderResolver
  arguments:
- - [@config_yaml_loader]
+ - ['@config_yaml_loader']
  config_loader:
  class: Symfony\Component\Config\Loader\DelegatingLoader
- arguments: [@config_loader_resolver]
+ arguments: ['@config_loader_resolver']
  config_processor:
  class: Symfony\Component\Config\Definition\Processor
  yaml_parser:
@@ -54,7 +54,7 @@ services:
  class: Helmich\TypoScriptLint\Util\Filesystem
  finder:
  class: Helmich\TypoScriptLint\Util\Finder
- arguments: [@symfony_finder, @filesystem]
+ arguments: ['@symfony_finder', '@filesystem']
  symfony_finder:
  class: Symfony\Component\Finder\Finder
  dispatcher:

diff --git a/tests/functional/Helmich/TypoScriptLint/Tests/Linter/LinterTest.php b/tests/functional/Helmich/TypoScriptLint/Tests/Linter/LinterTest.php
@@ -46,7 +46,7 @@ public function testLinterCreatesExpectedOutput($typoscriptFile, array $expected
  $localConfigFilename = dirname($typoscriptFile) . '/tslint.yml';
  $localConfigData = [];
  if (file_exists($localConfigFilename)) {
- $localConfigData = Yaml::parse($localConfigFilename);
+ $localConfigData = Yaml::parse(file_get_contents($localConfigFilename));
  }
 
  $globalConfigData = Yaml::parse(file_get_contents(__DIR__ . '/Fixtures/tslint.dist.yml'));