From aeccacefadd9bf25d4aafd13c3d2c7b730b46b33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Gallego?= Date: Thu, 20 Feb 2014 22:30:01 +0100 Subject: [PATCH] Fix tests and imports --- tests/ZfrRestTest/Asset/Resource/Metadata/Annotation/B.php | 1 - tests/ZfrRestTest/Asset/Resource/Metadata/Annotation/C.php | 1 - tests/ZfrRestTest/Mvc/HttpExceptionListenerTest.php | 2 +- tests/ZfrRestTest/Resource/Metadata/ResourceMetadataTest.php | 1 - .../ZfrRestTest/Router/Http/Matcher/BaseSubPathMatcherTest.php | 3 --- tests/ZfrRestTest/Util/ServiceManagerFactory.php | 2 +- 6 files changed, 2 insertions(+), 8 deletions(-) diff --git a/tests/ZfrRestTest/Asset/Resource/Metadata/Annotation/B.php b/tests/ZfrRestTest/Asset/Resource/Metadata/Annotation/B.php index 4cbcd98..80032cf 100644 --- a/tests/ZfrRestTest/Asset/Resource/Metadata/Annotation/B.php +++ b/tests/ZfrRestTest/Asset/Resource/Metadata/Annotation/B.php @@ -19,7 +19,6 @@ namespace ZfrRestTest\Asset\Resource\Metadata\Annotation; use Doctrine\ORM\Mapping as ORM; -use ZfrRest\Resource\Metadata\Annotation\AnnotationInterface as REST; /** * @author Michaël Gallego diff --git a/tests/ZfrRestTest/Asset/Resource/Metadata/Annotation/C.php b/tests/ZfrRestTest/Asset/Resource/Metadata/Annotation/C.php index 4b154ee..e6d9525 100644 --- a/tests/ZfrRestTest/Asset/Resource/Metadata/Annotation/C.php +++ b/tests/ZfrRestTest/Asset/Resource/Metadata/Annotation/C.php @@ -19,7 +19,6 @@ namespace ZfrRestTest\Asset\Resource\Metadata\Annotation; use Doctrine\ORM\Mapping as ORM; -use ZfrRest\Resource\Metadata\Annotation\AnnotationInterface as REST; /** * @author Michaël Gallego diff --git a/tests/ZfrRestTest/Mvc/HttpExceptionListenerTest.php b/tests/ZfrRestTest/Mvc/HttpExceptionListenerTest.php index 9508a13..0bbc33b 100755 --- a/tests/ZfrRestTest/Mvc/HttpExceptionListenerTest.php +++ b/tests/ZfrRestTest/Mvc/HttpExceptionListenerTest.php @@ -21,8 +21,8 @@ use PHPUnit_Framework_TestCase; use Zend\Http\Response as HttpResponse; use Zend\Mvc\MvcEvent; -use ZfrRest\Mvc\HttpExceptionListener; use ZfrRest\Http\Exception; +use ZfrRest\Mvc\HttpExceptionListener; /** * @licence MIT diff --git a/tests/ZfrRestTest/Resource/Metadata/ResourceMetadataTest.php b/tests/ZfrRestTest/Resource/Metadata/ResourceMetadataTest.php index 159f18d..e483913 100644 --- a/tests/ZfrRestTest/Resource/Metadata/ResourceMetadataTest.php +++ b/tests/ZfrRestTest/Resource/Metadata/ResourceMetadataTest.php @@ -20,7 +20,6 @@ use PHPUnit_Framework_TestCase; use ReflectionClass; -use ZfrRest\Resource\Metadata\CollectionResourceMetadata; use ZfrRest\Resource\Metadata\ResourceMetadata; /** diff --git a/tests/ZfrRestTest/Router/Http/Matcher/BaseSubPathMatcherTest.php b/tests/ZfrRestTest/Router/Http/Matcher/BaseSubPathMatcherTest.php index bfc6ed6..fd3e4fd 100644 --- a/tests/ZfrRestTest/Router/Http/Matcher/BaseSubPathMatcherTest.php +++ b/tests/ZfrRestTest/Router/Http/Matcher/BaseSubPathMatcherTest.php @@ -18,11 +18,8 @@ namespace ZfrRestTest\Router\Http\Matcher; -use Doctrine\Common\Collections\ArrayCollection; use PHPUnit_Framework_TestCase as TestCase; -use ZfrRest\Resource\ResourceInterface; use ZfrRest\Router\Http\Matcher\BaseSubPathMatcher; -use ZfrRest\Router\Http\Matcher\CollectionSubPathMatcher; use ZfrRest\Router\Http\Matcher\SubPathMatch; /** diff --git a/tests/ZfrRestTest/Util/ServiceManagerFactory.php b/tests/ZfrRestTest/Util/ServiceManagerFactory.php index 7ef60ef..423227e 100644 --- a/tests/ZfrRestTest/Util/ServiceManagerFactory.php +++ b/tests/ZfrRestTest/Util/ServiceManagerFactory.php @@ -19,8 +19,8 @@ namespace ZfrRestTest\Util; -use Zend\ServiceManager\ServiceManager; use Zend\Mvc\Service\ServiceManagerConfig; +use Zend\ServiceManager\ServiceManager; /** * Base test case to be used when a new service manager instance is required