@@ -64,7 +64,7 @@ |
||
| 64 | 64 | } |
| 65 | 65 | |
| 66 | 66 | /** |
| 67 | - * @return array |
|
| 67 | + * @return Compiler\CoreInitializationPass[] |
|
| 68 | 68 | */ |
| 69 | 69 | public function getCompilerPasses() |
| 70 | 70 | { |
@@ -2,11 +2,10 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace SilverStripe\BehatExtension; |
| 4 | 4 | |
| 5 | -use Symfony\Component\Config\FileLocator, |
|
| 6 | - Symfony\Component\DependencyInjection\ContainerBuilder, |
|
| 7 | - Symfony\Component\DependencyInjection\Loader\YamlFileLoader, |
|
| 8 | - Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition; |
|
| 9 | - |
|
| 5 | +use Symfony\Component\Config\FileLocator; |
|
| 6 | +use Symfony\Component\DependencyInjection\ContainerBuilder; |
|
| 7 | +use Symfony\Component\DependencyInjection\Loader\YamlFileLoader; |
|
| 8 | +use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition; |
|
| 10 | 9 | use Behat\Behat\Extension\ExtensionInterface; |
| 11 | 10 | |
| 12 | 11 | /* |
@@ -2,11 +2,11 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace SilverStripe\BehatExtension\Context; |
| 4 | 4 | |
| 5 | -use Behat\Behat\Context\BehatContext, |
|
| 6 | - Behat\Behat\Event\ScenarioEvent, |
|
| 7 | - Behat\Gherkin\Node\PyStringNode, |
|
| 8 | - Behat\Gherkin\Node\TableNode, |
|
| 9 | - SilverStripe\Filesystem\Storage\AssetStore; |
|
| 5 | +use Behat\Behat\Context\BehatContext; |
|
| 6 | +use Behat\Behat\Event\ScenarioEvent; |
|
| 7 | +use Behat\Gherkin\Node\PyStringNode; |
|
| 8 | +use Behat\Gherkin\Node\TableNode; |
|
| 9 | +use SilverStripe\Filesystem\Storage\AssetStore; |
|
| 10 | 10 | |
| 11 | 11 | // PHPUnit |
| 12 | 12 | require_once 'PHPUnit/Autoload.php'; |
@@ -555,6 +555,10 @@ |
||
| 555 | 555 | return $data; |
| 556 | 556 | } |
| 557 | 557 | |
| 558 | + /** |
|
| 559 | + * @param string $class |
|
| 560 | + * @param string $identifier |
|
| 561 | + */ |
|
| 558 | 562 | protected function prepareAsset($class, $identifier, $data = null) { |
| 559 | 563 | if(!$data) $data = array(); |
| 560 | 564 | $relativeTargetPath = (isset($data['Filename'])) ? $data['Filename'] : $identifier; |