Merge branch 'hotfix/7355'

Close #7355
zendframework · Mar 23, 2015 · 121cdf3 · 121cdf3
2 parents 0d24ccc + 33d8d0f
commit 121cdf3
Show file tree

Hide file tree

Showing 12 changed files with 1 addition and 13 deletions.
diff --git a/composer.json b/composer.json
@@ -14,8 +14,7 @@
     },
     "require-dev": {
         "doctrine/annotations": ">=1.0",
-        "ircmaxell/random-lib": "dev-master",
-        "ircmaxell/security-lib": "dev-master",
+        "ircmaxell/random-lib": ">=1.1",
         "mikey179/vfsStream": "1.2.*",
         "fabpot/php-cs-fixer": "1.*",
         "phpunit/PHPUnit": "~4.0",

diff --git a/tests/ZendTest/Authentication/Validator/AuthenticationTest.php b/tests/ZendTest/Authentication/Validator/AuthenticationTest.php
@@ -11,7 +11,6 @@
 
 use Zend\Authentication\Validator\Authentication as AuthenticationValidator;
 use Zend\Authentication\AuthenticationService;
-use Zend\Authentication as Auth;
 use ZendTest\Authentication as AuthTest;
 
 /**

diff --git a/tests/ZendTest/Code/Generator/TraitGeneratorTest.php b/tests/ZendTest/Code/Generator/TraitGeneratorTest.php
@@ -10,7 +10,6 @@
 namespace ZendTest\Code\Generator;
 
 use Zend\Code\Generator\TraitGenerator;
-use Zend\Code\Generator\ClassGenerator;
 use Zend\Code\Generator\DocBlockGenerator;
 use Zend\Code\Generator\PropertyGenerator;
 use Zend\Code\Generator\MethodGenerator;

diff --git a/tests/ZendTest/File/Transfer/Adapter/AbstractTest.php b/tests/ZendTest/File/Transfer/Adapter/AbstractTest.php
@@ -12,7 +12,6 @@
 use Zend\File;
 use Zend\Filter;
 use Zend\Filter\Word;
-use Zend\Loader;
 use Zend\Validator;
 use Zend\Validator\File as FileValidator;
 

diff --git a/tests/ZendTest/Form/Element/DateTimeSelectTest.php b/tests/ZendTest/Form/Element/DateTimeSelectTest.php
@@ -12,7 +12,6 @@
 use DateTime;
 use PHPUnit_Framework_TestCase as TestCase;
 use Zend\Form\Element\DateTimeSelect as DateTimeSelectElement;
-use Zend\Form\Factory;
 use Zend\Form\Exception;
 use Zend\InputFilter\Factory as InputFilterFactory;
 

diff --git a/tests/ZendTest/Http/Client/UseCaseTest.php b/tests/ZendTest/Http/Client/UseCaseTest.php
@@ -11,7 +11,6 @@
 
 use Zend\Http\Client as HTTPClient;
 use Zend\Http\Client\Adapter;
-use Zend\Http\Response;
 use Zend\Http\Request;
 
 

diff --git a/tests/ZendTest/I18n/View/Helper/PluralTest.php b/tests/ZendTest/I18n/View/Helper/PluralTest.php
@@ -9,7 +9,6 @@
 
 namespace ZendTest\I18n\View\Helper;
 
-use Zend\I18n\Translator\Plural\Rule as PluralRule;
 use Zend\I18n\View\Helper\Plural as PluralHelper;
 
 /**

diff --git a/tests/ZendTest/Mvc/View/Console/DefaultRenderingStrategyTest.php b/tests/ZendTest/Mvc/View/Console/DefaultRenderingStrategyTest.php
@@ -10,7 +10,6 @@
 namespace ZendTest\Mvc\View\Console;
 
 use PHPUnit_Framework_TestCase as TestCase;
-use Zend\EventManager\Event;
 use Zend\EventManager\EventManager;
 use Zend\Mvc\MvcEvent;
 use Zend\Mvc\View\Console\DefaultRenderingStrategy;

diff --git a/tests/ZendTest/Mvc/View/DefaultRendereringStrategyTest.php b/tests/ZendTest/Mvc/View/DefaultRendereringStrategyTest.php
@@ -18,7 +18,6 @@
 use Zend\Mvc\MvcEvent;
 use Zend\Mvc\View\Http\DefaultRenderingStrategy;
 use Zend\ServiceManager\ServiceManager;
-use Zend\View\Model\ModelInterface as Model;
 use Zend\View\Renderer\PhpRenderer;
 use Zend\View\View;
 use Zend\View\Model\ViewModel;

diff --git a/tests/ZendTest/View/Renderer/FeedRendererTest.php b/tests/ZendTest/View/Renderer/FeedRendererTest.php
@@ -10,7 +10,6 @@
 namespace ZendTest\View\Renderer;
 
 use PHPUnit_Framework_TestCase as TestCase;
-use Zend\View\Model\ModelInterface as Model;
 use Zend\View\Model\FeedModel;
 use Zend\View\Model\ViewModel;
 use Zend\View\Renderer\FeedRenderer;

diff --git a/tests/ZendTest/View/Strategy/FeedStrategyTest.php b/tests/ZendTest/View/Strategy/FeedStrategyTest.php
@@ -14,7 +14,6 @@
 use Zend\Feed\Writer\FeedFactory;
 use Zend\Http\Request as HttpRequest;
 use Zend\Http\Response as HttpResponse;
-use Zend\View\Model\ModelInterface as Model;
 use Zend\View\Model\FeedModel;
 use Zend\View\Model\ViewModel;
 use Zend\View\Renderer\FeedRenderer;

diff --git a/tests/ZendTest/View/Strategy/JsonStrategyTest.php b/tests/ZendTest/View/Strategy/JsonStrategyTest.php
@@ -13,7 +13,6 @@
 use Zend\EventManager\EventManager;
 use Zend\Http\Request as HttpRequest;
 use Zend\Http\Response as HttpResponse;
-use Zend\View\Model\ModelInterface as Model;
 use Zend\View\Model\JsonModel;
 use Zend\View\Model\ViewModel;
 use Zend\View\Renderer\JsonRenderer;
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,7 +9,6 @@ @@
     namespace ZendTest\I18n\View\Helper;
-    use Zend\I18n\Translator\Plural\Rule as PluralRule;
     use Zend\I18n\View\Helper\Plural as PluralHelper;
     /**
@@ Expand Down @@