Skip to content

Commit

Permalink
Add symfony 5 support
Browse files Browse the repository at this point in the history
  • Loading branch information
Grigory Tihonov committed May 16, 2023
1 parent 6e6a5f8 commit 85dc6cf
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 13 deletions.
12 changes: 6 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,16 @@
"require": {
"php": "^7.2",
"lamoda/atol-client": "^1.3.0",
"symfony/dependency-injection": "^3.4 || ^4.0",
"symfony/http-kernel": "^3.4 || ^4.0",
"symfony/config": "^3.4 || ^4.0",
"symfony/yaml": "^3.4 || ^4.0",
"symfony/dependency-injection": "^4.0 || ^5.0",
"symfony/http-kernel": "^4.0 || ^5.0",
"symfony/config": "^4.0 || ^5.0",
"symfony/yaml": "^4.0 || ^5.0",
"jms/serializer-bundle": "^3.3",
"guzzlehttp/guzzle": "^6.0"
},
"require-dev": {
"symfony/symfony": "~2.8 || ~3.4 || ^4.2.9",
"phpunit/phpunit": "^5.7.10",
"symfony/symfony": "^4.2.9 || 5.4",
"phpunit/phpunit": "^7.5.20",
"friendsofphp/php-cs-fixer": "^2.11"
},
"autoload": {
Expand Down
4 changes: 2 additions & 2 deletions src/DependencyInjection/Configuration.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ final class Configuration implements ConfigurationInterface
{
public function getConfigTreeBuilder()
{
$builder = new TreeBuilder();
$builder = new TreeBuilder('atol_client');

$root = $builder->root('atol_client');
$root = $builder->getRootNode();

$root
->beforeNormalization()
Expand Down
10 changes: 5 additions & 5 deletions tests/App/Kernel.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,21 +24,21 @@ public function registerBundles()
*/
public function registerContainerConfiguration(LoaderInterface $loader)
{
$loader->load($this->rootDir . '/config/config.yaml');
$clientConfig = $this->rootDir . '/config/config_' . $this->environment . '.yaml';
$loader->load($this->getProjectDir() . '/tests/App/config/config.yaml');
$clientConfig = $this->getProjectDir() . '/tests/App/config/config_' . $this->environment . '.yaml';
if (!file_exists($clientConfig)) {
$clientConfig = $this->rootDir . '/config/config_single_client.yaml';
$clientConfig = $this->getProjectDir() . '/tests/App/config/config_single_client.yaml';
}
$loader->load($clientConfig);
}

public function getCacheDir()
{
return $this->rootDir . '/../../build/var/cache/' . $this->environment;
return $this->getProjectDir() . '/build/var/cache/' . $this->environment;
}

public function getLogDir()
{
return $this->rootDir . '/../../build/var/logs/' . $this->environment;
return $this->getProjectDir() . '/build/var/logs/' . $this->environment;
}
}

0 comments on commit 85dc6cf

Please sign in to comment.