Skip to content
This repository was archived by the owner on Sep 15, 2022. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
language: php
php:
- 5.4
- 5.5
- 5.6
- 7.0
- 7.1
- 7.2
- nightly
- hhvm

matrix:
allow_failures:
- php: 7.0
- php: nightly
- php: hhvm

branches:
Expand Down
8 changes: 4 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@
"psr-0": { "Knp\\FriendlyContexts": "src/"}
},
"require": {
"php": ">=5.4.0",
"php": ">=7.0",
"behat/behat": "~3.0",
"symfony/property-access": "~2.3|~3.0",
"symfony/property-access": "~2.3|~3.0|~4.0",
"doctrine/inflector": "~1.0",
"doctrine/data-fixtures": "~1.0",
"behat/mink-extension": "~2.0",
"fzaninotto/faker": "~1.4",
"nelmio/alice": "~2.0",
"nelmio/alice": "~3.1",
"guzzle/guzzle": "~3.7"
},
"require-dev": {
"phpspec/phpspec": "~2.4|~3.0",
"phpspec/phpspec": "~3.0",
"doctrine/orm": "~2.5",
"knplabs/phpspec-welldone-extension": "dev-master"
},
Expand Down
7 changes: 6 additions & 1 deletion src/Knp/FriendlyContexts/Alice/Fixtures/Loader.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
namespace Knp\FriendlyContexts\Alice\Fixtures;

use Knp\FriendlyContexts\Alice\ProviderResolver;
use Nelmio\Alice\Fixtures\Loader as BaseLoader;
use Nelmio\Alice\Loader\NativeLoader as BaseLoader;

class Loader extends BaseLoader
{
Expand All @@ -24,6 +24,11 @@ public function clearCache()
$this->cache = [];
}

public function load($filename)
{
return $this->loadFile($filename);
}

/**
* {@inheritdoc}
*/
Expand Down
2 changes: 1 addition & 1 deletion src/Knp/FriendlyContexts/services/builder.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,5 +48,5 @@ services:
friendly.http_client:
class: Guzzle\Http\Client
arguments:
- %friendly.api.base_url%
- "%friendly.api.base_url%"

12 changes: 6 additions & 6 deletions src/Knp/FriendlyContexts/services/core.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ services:
friendly.initializer:
class: Knp\FriendlyContexts\Context\Initializer\FriendlyInitializer
arguments:
- %friendly.parameters%
- "%friendly.parameters%"
- "@service_container"
tags:
- { name: context.initializer }
Expand All @@ -15,14 +15,14 @@ services:
class: Knp\FriendlyContexts\Alice\ProviderResolver
arguments:
- "@service_container"
- %friendly.alice.providers%
- "%friendly.alice.providers%"

friendly.alice.fixtures.loader:
class: Knp\FriendlyContexts\Alice\Fixtures\Loader
arguments:
- %friendly.alice.locale%
- "%friendly.alice.locale%"
- "@friendly.alice.provider_resolver"
scope: prototype
shared: false

friendly.record.bag:
class: Knp\FriendlyContexts\Record\Collection\Bag
Expand Down Expand Up @@ -67,7 +67,7 @@ services:
friendly.page.resolver:
class: Knp\FriendlyContexts\Page\Resolver\PageClassResolver
arguments:
- %friendly.page.namespace%
- "%friendly.page.namespace%"

friendly.call.call_center:
class: Knp\FriendlyContexts\Call\CallCenter
Expand All @@ -87,7 +87,7 @@ services:
- "@specifications.locator.filesystem_feature"
- "@friendly.definition.definition_finder"
- "@friendly.call.call_center"
- %friendly.smartTag%
- "%friendly.smartTag%"
tags:
- { name: environment.reader }

Expand Down