From 307427e00afb9b8d3ddf2619f029e944f232ea6b Mon Sep 17 00:00:00 2001 From: Matthew Weier O'Phinney Date: Mon, 9 Jul 2012 16:46:59 -0500 Subject: [PATCH] [zen-49] Correct import statements across framework - 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" --- src/Config.php | 2 +- src/Processor/Queue.php | 2 +- src/Processor/Token.php | 2 +- src/Reader/Json.php | 2 +- src/Writer/AbstractWriter.php | 2 +- src/Writer/Xml.php | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Config.php b/src/Config.php index 70fa03a..ece2b09 100644 --- a/src/Config.php +++ b/src/Config.php @@ -10,9 +10,9 @@ namespace Zend\Config; +use ArrayAccess; use Countable; use Iterator; -use ArrayAccess; use Zend\Stdlib\ArrayUtils; /** diff --git a/src/Processor/Queue.php b/src/Processor/Queue.php index e369149..fb276ba 100644 --- a/src/Processor/Queue.php +++ b/src/Processor/Queue.php @@ -11,8 +11,8 @@ namespace Zend\Config\Processor; use Zend\Config\Config; -use Zend\Stdlib\PriorityQueue; use Zend\Config\Exception; +use Zend\Stdlib\PriorityQueue; /** * @category Zend diff --git a/src/Processor/Token.php b/src/Processor/Token.php index cf725ba..022daf5 100644 --- a/src/Processor/Token.php +++ b/src/Processor/Token.php @@ -10,9 +10,9 @@ namespace Zend\Config\Processor; +use Traversable; use Zend\Config\Config; use Zend\Config\Exception; -use Traversable; /** * @category Zend diff --git a/src/Reader/Json.php b/src/Reader/Json.php index 01a5f9e..a84b7e4 100644 --- a/src/Reader/Json.php +++ b/src/Reader/Json.php @@ -11,8 +11,8 @@ namespace Zend\Config\Reader; use Zend\Config\Exception; -use Zend\Json\Json as JsonFormat; use Zend\Json\Exception as JsonException; +use Zend\Json\Json as JsonFormat; /** * JSON config reader. diff --git a/src/Writer/AbstractWriter.php b/src/Writer/AbstractWriter.php index 1d6df80..b2817ec 100644 --- a/src/Writer/AbstractWriter.php +++ b/src/Writer/AbstractWriter.php @@ -11,8 +11,8 @@ namespace Zend\Config\Writer; use Traversable; -use Zend\Config\Exception; use Zend\Config\Config; +use Zend\Config\Exception; use Zend\Stdlib\ArrayUtils; /** diff --git a/src/Writer/Xml.php b/src/Writer/Xml.php index 1e6ec03..c4e0827 100644 --- a/src/Writer/Xml.php +++ b/src/Writer/Xml.php @@ -10,8 +10,8 @@ namespace Zend\Config\Writer; -use Zend\Config\Exception; use XMLWriter; +use Zend\Config\Exception; /** * @category Zend