Skip to content
This repository has been archived by the owner on Jan 31, 2020. It is now read-only.

Commit

Permalink
[zen-49] Correct import statements across framework
Browse files Browse the repository at this point in the history
- Ran a script that would create multiple import statements out of multi-line
  import statements, and which would sort all import statements in alphabetic
  order. Script is at https://gist.github.com/3079222 and was run by dropping
  into the library/Zend folder and typing (in zsh)
  "for file in **/*.php;do php /path/to/replace-uses.php $file; done"
  • Loading branch information
weierophinney committed Jul 9, 2012
1 parent 149f361 commit 0efca0b
Show file tree
Hide file tree
Showing 18 changed files with 22 additions and 22 deletions.
2 changes: 1 addition & 1 deletion src/Helper/Doctype.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@

namespace Zend\View\Helper;

use Zend\View\Exception;
use ArrayObject;
use Zend\View\Exception;

/**
* Helper for setting and retrieving the doctype
Expand Down
2 changes: 1 addition & 1 deletion src/Helper/EscapeCss.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@

namespace Zend\View\Helper;

use Zend\View\Helper\Escaper;
use Zend\View\Exception;
use Zend\View\Helper\Escaper;

/**
* Helper for escaping values
Expand Down
2 changes: 1 addition & 1 deletion src/Helper/EscapeHtml.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@

namespace Zend\View\Helper;

use Zend\View\Helper\Escaper;
use Zend\View\Exception;
use Zend\View\Helper\Escaper;

/**
* Helper for escaping values
Expand Down
2 changes: 1 addition & 1 deletion src/Helper/EscapeHtmlAttr.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@

namespace Zend\View\Helper;

use Zend\View\Helper\Escaper;
use Zend\View\Exception;
use Zend\View\Helper\Escaper;

/**
* Helper for escaping values
Expand Down
2 changes: 1 addition & 1 deletion src/Helper/EscapeJs.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@

namespace Zend\View\Helper;

use Zend\View\Helper\Escaper;
use Zend\View\Exception;
use Zend\View\Helper\Escaper;

/**
* Helper for escaping values
Expand Down
2 changes: 1 addition & 1 deletion src/Helper/EscapeUrl.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@

namespace Zend\View\Helper;

use Zend\View\Helper\Escaper;
use Zend\View\Exception;
use Zend\View\Helper\Escaper;

/**
* Helper for escaping values
Expand Down
4 changes: 2 additions & 2 deletions src/Helper/Escaper/AbstractHelper.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@

namespace Zend\View\Helper\Escaper;

use Zend\View\Helper;
use Zend\View\Exception;
use Zend\Escaper;
use Zend\View\Exception;
use Zend\View\Helper;

/**
* Helper for escaping values
Expand Down
2 changes: 1 addition & 1 deletion src/Helper/Navigation.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@

use Zend\Navigation\AbstractContainer;
use Zend\ServiceManager\ServiceLocatorAwareInterface;
use Zend\View\Exception;
use Zend\View\Helper\Navigation\AbstractHelper as AbstractNavigationHelper;
use Zend\View\Helper\Navigation\HelperInterface as NavigationHelper;
use Zend\View\Exception;

/**
* Proxy helper for retrieving navigational helpers and forwarding calls
Expand Down
2 changes: 1 addition & 1 deletion src/Helper/Navigation/AbstractHelper.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@

use RecursiveIteratorIterator;
use Zend\Acl;
use Zend\I18n\Translator\Translator;
use Zend\Navigation;
use Zend\Navigation\Page\AbstractPage;
use Zend\ServiceManager\ServiceLocatorAwareInterface;
use Zend\ServiceManager\ServiceLocatorInterface;
use Zend\I18n\Translator\Translator;
use Zend\View;
use Zend\View\Exception;

Expand Down
4 changes: 2 additions & 2 deletions src/Helper/Navigation/Links.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@

namespace Zend\View\Helper\Navigation;

use Traversable;
use Zend\Stdlib\ArrayUtils;
use RecursiveIteratorIterator;
use Traversable;
use Zend\Navigation\AbstractContainer;
use Zend\Navigation\Page\AbstractPage;
use Zend\Stdlib\ArrayUtils;
use Zend\View;
use Zend\View\Exception;

Expand Down
2 changes: 1 addition & 1 deletion src/Helper/Navigation/Sitemap.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@

use DOMDocument;
use RecursiveIteratorIterator;
use Zend\Navigation\Page\AbstractPage;
use Zend\Navigation\AbstractContainer;
use Zend\Navigation\Page\AbstractPage;
use Zend\Uri;
use Zend\View;
use Zend\View\Exception;
Expand Down
2 changes: 1 addition & 1 deletion src/Helper/Placeholder/Container/AbstractStandalone.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@

namespace Zend\View\Helper\Placeholder\Container;

use Zend\View\Helper\Placeholder\Registry;
use Zend\View\Exception;
use Zend\View\Helper\Placeholder\Registry;

/**
* Base class for targetted placeholder helpers
Expand Down
2 changes: 1 addition & 1 deletion src/Helper/Url.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@

namespace Zend\View\Helper;

use Zend\Mvc\Router\RouteStackInterface;
use Zend\Mvc\Router\RouteMatch;
use Zend\Mvc\Router\RouteStackInterface;
use Zend\View\Exception;

/**
Expand Down
4 changes: 2 additions & 2 deletions src/Renderer/FeedRenderer.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
namespace Zend\View\Renderer;

use Zend\View\Exception;
use Zend\View\Resolver\ResolverInterface as Resolver;
use Zend\View\Model\ModelInterface as Model;
use Zend\View\Model\FeedModel;
use Zend\View\Model\ModelInterface as Model;
use Zend\View\Resolver\ResolverInterface as Resolver;

/**
* Interface class for Zend_View compatible template engine implementations
Expand Down
2 changes: 1 addition & 1 deletion src/Renderer/JsonRenderer.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
use Zend\Json\Json;
use Zend\Stdlib\ArrayUtils;
use Zend\View\Exception;
use Zend\View\Model\ModelInterface as Model;
use Zend\View\Model\JsonModel;
use Zend\View\Model\ModelInterface as Model;
use Zend\View\Renderer\RendererInterface as Renderer;
use Zend\View\Resolver\ResolverInterface as Resolver;

Expand Down
2 changes: 1 addition & 1 deletion src/Renderer/PhpRenderer.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
use Zend\View\Exception;
use Zend\View\HelperPluginManager;
use Zend\View\Model\ModelInterface as Model;
use Zend\View\Resolver\TemplatePathStack;
use Zend\View\Renderer\RendererInterface as Renderer;
use Zend\View\Resolver\ResolverInterface as Resolver;
use Zend\View\Resolver\TemplatePathStack;
use Zend\View\Variables;

/**
Expand Down
2 changes: 1 addition & 1 deletion src/Renderer/RendererInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@

namespace Zend\View\Renderer;

use Zend\View\Resolver\ResolverInterface as Resolver;
use Zend\View\Model\ModelInterface as Model;
use Zend\View\Resolver\ResolverInterface as Resolver;

/**
* Interface class for Zend_View compatible template engine implementations
Expand Down
4 changes: 2 additions & 2 deletions src/View.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@

namespace Zend\View;

use Zend\EventManager\EventManagerInterface;
use Zend\EventManager\EventManager;
use Zend\EventManager\EventManagerAwareInterface;
use Zend\EventManager\EventManagerInterface;
use Zend\Mvc\MvcEvent;
use Zend\Stdlib\RequestInterface as Request;
use Zend\Stdlib\ResponseInterface as Response;
use Zend\View\Renderer\RendererInterface as Renderer;
use Zend\View\Model\ModelInterface as Model;
use Zend\View\Renderer\RendererInterface as Renderer;
use Zend\View\Renderer\TreeRendererInterface;

/**
Expand Down

0 comments on commit 0efca0b

Please sign in to comment.