From fd3ae221e839bedceaade57407f91104b5c38deb Mon Sep 17 00:00:00 2001 From: Tomas Votruba Date: Mon, 9 Feb 2015 12:50:40 +0100 Subject: [PATCH] misc ns --- src/DI/LoggableExtension.php | 3 ++- src/DI/SluggableExtension.php | 3 ++- src/DI/SoftDeletableExtension.php | 3 ++- src/DI/TimestampableExtension.php | 3 ++- src/DI/TranslatableExtension.php | 3 ++- src/Loggable/LoggerCallable.php | 4 +--- tests/bootstrap.php | 34 +++++++++++++++++++++++++++++++ 7 files changed, 45 insertions(+), 8 deletions(-) create mode 100644 tests/bootstrap.php diff --git a/src/DI/LoggableExtension.php b/src/DI/LoggableExtension.php index deee776..d3e0148 100644 --- a/src/DI/LoggableExtension.php +++ b/src/DI/LoggableExtension.php @@ -8,6 +8,7 @@ namespace Zenify\DoctrineBehaviors\DI; use Kdyby; +use Kdyby\Events\DI\EventsExtension; use Knp\DoctrineBehaviors\ORM\Loggable\LoggableSubscriber; use Nette\Utils\AssertionException; use Nette\Utils\Validators; @@ -41,7 +42,7 @@ public function loadConfiguration() '@' . $loggerCallable->getClass() ]) ->setAutowired(FALSE) - ->addTag(Kdyby\Events\DI\EventsExtension::TAG_SUBSCRIBER); + ->addTag(EventsExtension::TAG_SUBSCRIBER); } diff --git a/src/DI/SluggableExtension.php b/src/DI/SluggableExtension.php index f556f35..2f5f5d3 100644 --- a/src/DI/SluggableExtension.php +++ b/src/DI/SluggableExtension.php @@ -8,6 +8,7 @@ namespace Zenify\DoctrineBehaviors\DI; use Kdyby; +use Kdyby\Events\DI\EventsExtension; use Knp\DoctrineBehaviors\Model\Sluggable\Sluggable; use Knp\DoctrineBehaviors\ORM\Sluggable\SluggableSubscriber; use Nette\Utils\AssertionException; @@ -39,7 +40,7 @@ public function loadConfiguration() $config['trait'] ]) ->setAutowired(FALSE) - ->addTag(Kdyby\Events\DI\EventsExtension::TAG_SUBSCRIBER); + ->addTag(EventsExtension::TAG_SUBSCRIBER); } diff --git a/src/DI/SoftDeletableExtension.php b/src/DI/SoftDeletableExtension.php index 54397a7..ae2da1d 100644 --- a/src/DI/SoftDeletableExtension.php +++ b/src/DI/SoftDeletableExtension.php @@ -8,6 +8,7 @@ namespace Zenify\DoctrineBehaviors\DI; use Kdyby; +use Kdyby\Events\DI\EventsExtension; use Knp\DoctrineBehaviors\Model\SoftDeletable\SoftDeletable; use Knp\DoctrineBehaviors\ORM\SoftDeletable\SoftDeletableSubscriber; use Nette\Utils\AssertionException; @@ -39,7 +40,7 @@ public function loadConfiguration() $config['trait'] ]) ->setAutowired(FALSE) - ->addTag(Kdyby\Events\DI\EventsExtension::TAG_SUBSCRIBER); + ->addTag(EventsExtension::TAG_SUBSCRIBER); } diff --git a/src/DI/TimestampableExtension.php b/src/DI/TimestampableExtension.php index 59ee78f..7fe42c9 100644 --- a/src/DI/TimestampableExtension.php +++ b/src/DI/TimestampableExtension.php @@ -8,6 +8,7 @@ namespace Zenify\DoctrineBehaviors\DI; use Kdyby; +use Kdyby\Events\DI\EventsExtension; use Knp\DoctrineBehaviors\Model\Timestampable\Timestampable; use Knp\DoctrineBehaviors\ORM\Timestampable\TimestampableSubscriber; use Nette\Utils\AssertionException; @@ -39,7 +40,7 @@ public function loadConfiguration() $config['trait'] ]) ->setAutowired(FALSE) - ->addTag(Kdyby\Events\DI\EventsExtension::TAG_SUBSCRIBER); + ->addTag(EventsExtension::TAG_SUBSCRIBER); } diff --git a/src/DI/TranslatableExtension.php b/src/DI/TranslatableExtension.php index 09819e4..d185486 100644 --- a/src/DI/TranslatableExtension.php +++ b/src/DI/TranslatableExtension.php @@ -8,6 +8,7 @@ namespace Zenify\DoctrineBehaviors\DI; use Kdyby; +use Kdyby\Events\DI\EventsExtension; use Knp\DoctrineBehaviors\Model\Translatable\Translation; use Knp\DoctrineBehaviors\ORM\Translatable\TranslatableSubscriber; use Nette\Utils\AssertionException; @@ -48,7 +49,7 @@ public function loadConfiguration() $config['translationFetchMode'] ]) ->setAutowired(FALSE) - ->addTag(Kdyby\Events\DI\EventsExtension::TAG_SUBSCRIBER); + ->addTag(EventsExtension::TAG_SUBSCRIBER); } diff --git a/src/Loggable/LoggerCallable.php b/src/Loggable/LoggerCallable.php index 062e464..eb923c2 100644 --- a/src/Loggable/LoggerCallable.php +++ b/src/Loggable/LoggerCallable.php @@ -7,10 +7,8 @@ namespace Zenify\DoctrineBehaviors\Loggable; -use Nette; - -class LoggerCallable extends Nette\Object +class LoggerCallable { /** diff --git a/tests/bootstrap.php b/tests/bootstrap.php new file mode 100644 index 0000000..87a666d --- /dev/null +++ b/tests/bootstrap.php @@ -0,0 +1,34 @@ +setTempDirectory($this->createAndReturnTempDir()); + $configurator->addConfig(__DIR__ . '/config/default.neon'); + return $configurator->createContainer(); + } + + + /** + * @return string + */ + private function createAndReturnTempDir() + { + $tempDir = __DIR__ . '/temp'; + @mkdir($tempDir, 0777, TRUE); + return $tempDir; + } + +}