Merge pull request #50 from Trejjam/master

Create DI::timestampStorage after call ContainerBuilder::getByType

.travis.yml

@@ -7,26 +7,25 @@ php:
   - 5.6
   - 7.0
   - hhvm
-  - hhvm-nightly
 
 env:
   - PHP_BIN=php
   - PHP_BIN=php-cgi
 
 matrix:
   allow_failures:
-    - php: 7.0
     - php: hhvm
-    - php: hhvm-nightly
 
   exclude:
     - php: hhvm
       env: PHP_BIN=php-cgi
 
-    - php: hhvm-nightly
-      env: PHP_BIN=php-cgi
+before_install:
+  - if [[ "$TRAVIS_PHP_VERSION" == "hhvm" ]]; then cat tests/php.ini-unix >> /etc/hhvm/php.ini; fi
+  - if [[ "$TRAVIS_PHP_VERSION" != "hhvm" ]]; then phpenv config-add tests/php.ini-unix; fi
 
 install:
+  - if [[ "$TRAVIS_PHP_VERSION" == "5.3.3" ]]; then composer config -g disable-tls true; composer config -g secure-http false; fi
   - composer self-update
   - composer install --prefer-source --no-interaction --optimize-autoloader
 

Cronner/DI/CronnerExtension.php

@@ -5,6 +5,7 @@
 use Nette\Configurator;
 use Nette\DI\Compiler;
 use Nette\DI\CompilerExtension;
+use Nette\DI\ContainerBuilder;
 use Nette\DI\Statement;
 use Nette\PhpGenerator\ClassType;
 use Nette\Utils\Json;
@@ -34,7 +35,17 @@ class CronnerExtension extends CompilerExtension
 		'bar' => '%debugMode%'
 	);
 
-
+	/**
+	 * @param ContainerBuilder $containerBuilder
+	 *
+	 * @return \Nette\DI\ServiceDefinition
+	 */
+	protected function createTimestampStorage(ContainerBuilder $containerBuilder)
+	{
+		return $containerBuilder->addDefinition($this->prefix('timestampStorage'))
+			->setAutowired(FALSE)
+			->setInject(FALSE);
+	}
 
 	public function loadConfiguration()
 	{
@@ -45,11 +56,11 @@ public function loadConfiguration()
 		Validators::assert($config['maxExecutionTime'], 'integer|null', 'Script max execution time');
 		Validators::assert($config['criticalSectionTempDir'], 'string', 'Critical section files directory path');
 
-		$storage = $container->addDefinition($this->prefix('timestampStorage'))
-			->setAutowired(FALSE)
-			->setInject(FALSE);
+
 		if ($config['timestampStorage'] === NULL) {
 			$storageServiceName = $container->getByType('stekycz\Cronner\ITimestampStorage');
+
+			$storage = $this->createTimestampStorage($container);
 			if ($storageServiceName) {
 				$storage->setFactory('@' . $storageServiceName);
 			} else {
@@ -58,6 +69,7 @@ public function loadConfiguration()
 				));
 			}
 		} else {
+			$storage = $this->createTimestampStorage($container);
 			if (is_string($config['timestampStorage']) && $container->getServiceName($config['timestampStorage'])) {
 				$storage->setFactory($config['timestampStorage']);
 			} else {
@@ -131,4 +143,4 @@ public static function register(Configurator $configurator)
 		};
 	}
 
-}
+}

composer.json

@@ -39,8 +39,5 @@
 	},
 	"autoload-dev": {
 		"classmap": ["tests/CronnerTests/objects"]
-	},
-	"config": {
-		"disable-tls": true
 	}
 }

tests/CronnerTests/DI/CronnerExtension.phpt

@@ -49,7 +49,7 @@ class CronnerExtensionTest extends \TestCase
 	public function testDefaultConfiguration()
 	{
 		$compiler = $this->compiler;
-		$compiler->compile(array());
+		$compiler->compile();
 
 		$timestampStorage = $compiler->getContainerBuilder()->getDefinition('cronner.timestampStorage');
 		$criticalSection = $compiler->getContainerBuilder()->getDefinition('cronner.criticalSection');
@@ -65,13 +65,16 @@ class CronnerExtensionTest extends \TestCase
 	public function testCompleteConfiguration()
 	{
 		$compiler = $this->compiler;
-		$compiler->compile(array(
-			'cronner' => array(
-				'timestampStorage' => new Nette\DI\Statement('stekycz\Cronner\TimestampStorage\DummyStorage'),
-				'maxExecutionTime' => 120,
-				'criticalSectionTempDir' => '%tempDir%/cronner',
+		$compiler->addConfig(
+			array(
+				'cronner' => array(
+					'timestampStorage' => new Nette\DI\Statement('stekycz\Cronner\TimestampStorage\DummyStorage'),
+					'maxExecutionTime' => 120,
+					'criticalSectionTempDir' => '%tempDir%/cronner',
+				)
 			)
-		));
+		);
+		$compiler->compile();
 
 		$timestampStorage = $compiler->getContainerBuilder()->getDefinition('cronner.timestampStorage');
 		$criticalSection = $compiler->getContainerBuilder()->getDefinition('cronner.criticalSection');