Fix use statements in Zend\Cloud

akandels · Jul 9, 2012 · b38759c · b38759c
1 parent c05ccff
commit b38759c
Show file tree

Hide file tree

Showing 37 changed files with 138 additions and 138 deletions.
diff --git a/library/Zend/Cloud/DocumentService/Adapter/AbstractAdapter.php b/library/Zend/Cloud/DocumentService/Adapter/AbstractAdapter.php
@@ -10,9 +10,9 @@
 
 namespace Zend\Cloud\DocumentService\Adapter;
 
-use Zend\Cloud\DocumentService\Document,
-    Zend\Cloud\DocumentService\DocumentSet,
-    Zend\Cloud\DocumentService\Query;
+use Zend\Cloud\DocumentService\Document;
+use Zend\Cloud\DocumentService\DocumentSet;
+use Zend\Cloud\DocumentService\Query;
 
 /**
  * Abstract document service adapter

diff --git a/library/Zend/Cloud/DocumentService/Adapter/SimpleDb.php b/library/Zend/Cloud/DocumentService/Adapter/SimpleDb.php
@@ -12,11 +12,11 @@
 
 use Traversable;
 use Zend\Stdlib\ArrayUtils;
-use Zend\Cloud\DocumentService\Adapter\SimpleDb\Query,
-    Zend\Service\Amazon\Exception as AmazonException,
-    Zend\Service\Amazon\SimpleDb\SimpleDb as SimpleDbService,
-    Zend\Service\Amazon\SimpleDb\Attribute,
-    Zend\Cloud\DocumentService\Document;
+use Zend\Cloud\DocumentService\Adapter\SimpleDb\Query;
+use Zend\Service\Amazon\Exception as AmazonException;
+use Zend\Service\Amazon\SimpleDb\SimpleDb as SimpleDbService;
+use Zend\Service\Amazon\SimpleDb\Attribute;
+use Zend\Cloud\DocumentService\Document;
 
 /**
  * SimpleDB adapter for document service.

diff --git a/library/Zend/Cloud/DocumentService/Adapter/SimpleDb/Query.php b/library/Zend/Cloud/DocumentService/Adapter/SimpleDb/Query.php
@@ -10,9 +10,9 @@
 
 namespace Zend\Cloud\DocumentService\Adapter\SimpleDb;
 
-use Zend\Cloud\DocumentService\Query as QueryInterface,
-    Zend\Cloud\DocumentService\Adapter\Exception,
-    Zend\Cloud\DocumentService\Adapter\SimpleDb as SimpleDbAdapter;
+use Zend\Cloud\DocumentService\Query as QueryInterface;
+use Zend\Cloud\DocumentService\Adapter\Exception;
+use Zend\Cloud\DocumentService\Adapter\SimpleDb as SimpleDbAdapter;
 
 /**
  * Class implementing Query adapter for working with SimpleDb queries in a

diff --git a/library/Zend/Cloud/DocumentService/Adapter/WindowsAzure.php b/library/Zend/Cloud/DocumentService/Adapter/WindowsAzure.php
@@ -12,11 +12,11 @@
 
 use Traversable;
 use Zend\Stdlib\ArrayUtils;
-use Zend\Cloud\DocumentService\Document,
-    Zend\Service\WindowsAzure\Exception as WindowsAzureException,
-    Zend\Service\WindowsAzure\Storage\Storage,
-    Zend\Service\WindowsAzure\Storage\Table,
-    Zend\Service\WindowsAzure\Storage\DynamicTableEntity;
+use Zend\Cloud\DocumentService\Document;
+use Zend\Service\WindowsAzure\Exception as WindowsAzureException;
+use Zend\Service\WindowsAzure\Storage\Storage;
+use Zend\Service\WindowsAzure\Storage\Table;
+use Zend\Service\WindowsAzure\Storage\DynamicTableEntity;
 
 
 /**

diff --git a/library/Zend/Cloud/DocumentService/Adapter/WindowsAzure/Query.php b/library/Zend/Cloud/DocumentService/Adapter/WindowsAzure/Query.php
@@ -10,9 +10,9 @@
 
 namespace Zend\Cloud\DocumentService\Adapter\WindowsAzure;
 
-use Zend\Cloud\DocumentService\QueryAdapter\QueryAdapterInterface,
-    Zend\Service\WindowsAzure\Storage\TableEntityQuery,
-    Zend\Cloud\DocumentService\Adapter\Exception;
+use Zend\Cloud\DocumentService\QueryAdapter\QueryAdapterInterface;
+use Zend\Service\WindowsAzure\Storage\TableEntityQuery;
+use Zend\Cloud\DocumentService\Adapter\Exception;
 
 /**
  * Class implementing Query adapter for working with Azure queries in a

diff --git a/library/Zend/Cloud/Infrastructure/Adapter/Ec2.php b/library/Zend/Cloud/Infrastructure/Adapter/Ec2.php
@@ -12,15 +12,15 @@
 
 use Traversable;
 use Zend\Stdlib\ArrayUtils;
-use Zend\Service\Amazon\Ec2\Instance as Ec2Instance,
-    Zend\Service\Amazon\Ec2\Image as Ec2Image,
-    Zend\Service\Amazon\Ec2\AvailabilityZones as Ec2Zone,
-    Zend\Service\Amazon\Ec2\CloudWatch as Ec2Monitor,
-    Zend\Service\Amazon\Ec2\Exception as Ec2Exception,
-    Zend\Cloud\Infrastructure\Instance,    
-    Zend\Cloud\Infrastructure\InstanceList,
-    Zend\Cloud\Infrastructure\Image,
-    Zend\Cloud\Infrastructure\ImageList;
+use Zend\Service\Amazon\Ec2\Instance as Ec2Instance;
+use Zend\Service\Amazon\Ec2\Image as Ec2Image;
+use Zend\Service\Amazon\Ec2\AvailabilityZones as Ec2Zone;
+use Zend\Service\Amazon\Ec2\CloudWatch as Ec2Monitor;
+use Zend\Service\Amazon\Ec2\Exception as Ec2Exception;
+use Zend\Cloud\Infrastructure\Instance;
+use Zend\Cloud\Infrastructure\InstanceList;
+use Zend\Cloud\Infrastructure\Image;
+use Zend\Cloud\Infrastructure\ImageList;
 
 /**
  * Amazon EC2 adapter for infrastructure service

diff --git a/library/Zend/Cloud/Infrastructure/Adapter/Rackspace.php b/library/Zend/Cloud/Infrastructure/Adapter/Rackspace.php
@@ -12,11 +12,11 @@
 
 use Traversable;
 use Zend\Stdlib\ArrayUtils;
-use Zend\Service\Rackspace\Servers as RackspaceServers,
-    Zend\Cloud\Infrastructure\Instance,
-    Zend\Cloud\Infrastructure\InstanceList,
-    Zend\Cloud\Infrastructure\Image,
-    Zend\Cloud\Infrastructure\ImageList;
+use Zend\Service\Rackspace\Servers as RackspaceServers;
+use Zend\Cloud\Infrastructure\Instance;
+use Zend\Cloud\Infrastructure\InstanceList;
+use Zend\Cloud\Infrastructure\Image;
+use Zend\Cloud\Infrastructure\ImageList;
 
 /**
  * Rackspace servers adapter for infrastructure service

diff --git a/library/Zend/Cloud/Infrastructure/Factory.php b/library/Zend/Cloud/Infrastructure/Factory.php
@@ -10,8 +10,8 @@
 
 namespace Zend\Cloud\Infrastructure;
 
-use Zend\Cloud\AbstractFactory,
-    Zend\Cloud\Exception\InvalidArgumentException;
+use Zend\Cloud\AbstractFactory;
+use Zend\Cloud\Exception\InvalidArgumentException;
 
 /**
  * Factory for infrastructure adapters

diff --git a/library/Zend/Cloud/Infrastructure/ImageList.php b/library/Zend/Cloud/Infrastructure/ImageList.php
@@ -10,11 +10,11 @@
 
 namespace Zend\Cloud\Infrastructure;
 
-use Zend\Cloud\Infrastructure\Image,  
-    Zend\Cloud\Infrastructure\Exception,
-    Countable,
-    Iterator,
-    ArrayAccess;
+use Zend\Cloud\Infrastructure\Image;
+use Zend\Cloud\Infrastructure\Exception;
+use Countable;
+use Iterator;
+use ArrayAccess;
 
 /**
  * List of images

diff --git a/library/Zend/Cloud/Infrastructure/InstanceList.php b/library/Zend/Cloud/Infrastructure/InstanceList.php
@@ -10,9 +10,9 @@
 
 namespace Zend\Cloud\Infrastructure;
 
-use Countable,
-    Iterator,
-    ArrayAccess;
+use Countable;
+use Iterator;
+use ArrayAccess;
 
 /**
  * List of instances

diff --git a/library/Zend/Cloud/QueueService/Adapter/AbstractAdapter.php b/library/Zend/Cloud/QueueService/Adapter/AbstractAdapter.php
@@ -10,9 +10,9 @@
 
 namespace Zend\Cloud\QueueService\Adapter;
 
-use Zend\Cloud\QueueService\Adapter,
-    Zend\Cloud\QueueService\Message,
-    Zend\Cloud\QueueService\MessageSet;
+use Zend\Cloud\QueueService\Adapter;
+use Zend\Cloud\QueueService\Message;
+use Zend\Cloud\QueueService\MessageSet;
 
 /**
  * Abstract queue adapter

diff --git a/library/Zend/Cloud/QueueService/Adapter/Sqs.php b/library/Zend/Cloud/QueueService/Adapter/Sqs.php
@@ -12,9 +12,9 @@
 
 use Traversable;
 use Zend\Stdlib\ArrayUtils;
-use Zend\Service\Amazon\Sqs\Sqs as AmazonSqs,
-    Zend\Cloud\QueueService\Message,
-    Zend\Cloud\QueueService\Exception;
+use Zend\Service\Amazon\Sqs\Sqs as AmazonSqs;
+use Zend\Cloud\QueueService\Message;
+use Zend\Cloud\QueueService\Exception;
 
 /**
  * SQS adapter for simple queue service.

diff --git a/library/Zend/Cloud/QueueService/Adapter/ZendQueue.php b/library/Zend/Cloud/QueueService/Adapter/ZendQueue.php
@@ -12,8 +12,8 @@
 
 use Traversable;
 use Zend\Stdlib\ArrayUtils;
-use Zend\Cloud\QueueService\Exception,
-    Zend\Queue\Queue;
+use Zend\Cloud\QueueService\Exception;
+use Zend\Queue\Queue;
 
 /**
  * WindowsAzure adapter for simple queue service.

diff --git a/library/Zend/Cloud/StorageService/Adapter/FileSystem.php b/library/Zend/Cloud/StorageService/Adapter/FileSystem.php
@@ -12,8 +12,8 @@
 
 use Traversable;
 use Zend\Stdlib\ArrayUtils;
-use Zend\Cloud\StorageService\Adapter,
-    Zend\Cloud\StorageService\Exception;
+use Zend\Cloud\StorageService\Adapter;
+use Zend\Cloud\StorageService\Exception;
 
 /**
  * FileSystem adapter for unstructured cloud storage.

diff --git a/library/Zend/Cloud/StorageService/Adapter/Nirvanix.php b/library/Zend/Cloud/StorageService/Adapter/Nirvanix.php
@@ -12,10 +12,10 @@
 
 use Traversable;
 use Zend\Stdlib\ArrayUtils;
-use Zend\Cloud\StorageService\Adapter,
-    Zend\Cloud\StorageService\Exception,
-    Zend\Service\Nirvanix\Nirvanix as NirvanixService,
-    Zend\Http\Client as HttpClient;
+use Zend\Cloud\StorageService\Adapter;
+use Zend\Cloud\StorageService\Exception;
+use Zend\Service\Nirvanix\Nirvanix as NirvanixService;
+use Zend\Http\Client as HttpClient;
 
 /**
  * Adapter for Nirvanix cloud storage

diff --git a/library/Zend/Cloud/StorageService/Adapter/Rackspace.php b/library/Zend/Cloud/StorageService/Adapter/Rackspace.php
@@ -10,12 +10,12 @@
 
 namespace Zend\Cloud\StorageService\Adapter;
 
-use Traversable,
-    Zend\Cloud\StorageService\Adapter,
-    Zend\Cloud\StorageService\Exception,
-    Zend\Service\Rackspace\Exception as RackspaceException,
-    Zend\Service\Rackspace\Files as RackspaceFile,
-    Zend\Stdlib\ArrayUtils;
+use Traversable;
+use Zend\Cloud\StorageService\Adapter;
+use Zend\Cloud\StorageService\Exception;
+use Zend\Service\Rackspace\Exception as RackspaceException;
+use Zend\Service\Rackspace\Files as RackspaceFile;
+use Zend\Stdlib\ArrayUtils;
 
 /**
  * Adapter for Rackspace cloud storage

diff --git a/library/Zend/Cloud/StorageService/Adapter/S3.php b/library/Zend/Cloud/StorageService/Adapter/S3.php
@@ -12,9 +12,9 @@
 
 use Traversable;
 use Zend\Stdlib\ArrayUtils;
-use Zend\Cloud\StorageService\Adapter,
-    Zend\Cloud\StorageService\Exception,
-    Zend\Service\Amazon\S3\S3 as AmazonS3;
+use Zend\Cloud\StorageService\Adapter;
+use Zend\Cloud\StorageService\Exception;
+use Zend\Service\Amazon\S3\S3 as AmazonS3;
 
 /**
  * S3 adapter for unstructured cloud storage.

diff --git a/tests/Zend/Cloud/DocumentService/Adapter/SimpleDbTest.php b/tests/Zend/Cloud/DocumentService/Adapter/SimpleDbTest.php
@@ -10,11 +10,11 @@
 
 namespace ZendTest\Cloud\DocumentService\Adapter;
 
-use ZendTest\Cloud\DocumentService\TestCase,
-    Zend\Cloud\DocumentService\Adapter\SimpleDb as AdapterSimpleDb,
-    Zend\Cloud\DocumentService\Document,
-    Zend\Cloud\DocumentService\Factory,
-    Zend\Config;
+use ZendTest\Cloud\DocumentService\TestCase;
+use Zend\Cloud\DocumentService\Adapter\SimpleDb as AdapterSimpleDb;
+use Zend\Cloud\DocumentService\Document;
+use Zend\Cloud\DocumentService\Factory;
+use Zend\Config;
 
 /**
  * @category   Zend

diff --git a/tests/Zend/Cloud/DocumentService/Adapter/WindowsAzureTest.php b/tests/Zend/Cloud/DocumentService/Adapter/WindowsAzureTest.php
@@ -10,10 +10,10 @@
 
 namespace ZendTest\Cloud\DocumentService\Adapter;
 
-use ZendTest\Cloud\DocumentService\TestCase,
-    Zend\Cloud\DocumentService\Factory,
-    Zend\Cloud\DocumentService\Adapter\WindowsAzure,
-    Zend\Config\Config;
+use ZendTest\Cloud\DocumentService\TestCase;
+use Zend\Cloud\DocumentService\Factory;
+use Zend\Cloud\DocumentService\Adapter\WindowsAzure;
+use Zend\Config\Config;
 
 /**
  * @category   Zend

diff --git a/tests/Zend/Cloud/DocumentService/FactoryTest.php b/tests/Zend/Cloud/DocumentService/FactoryTest.php
@@ -10,10 +10,10 @@
 
 namespace ZendTest\Cloud\DocumentService;
 
-use Zend\Cloud\DocumentService\Factory as DocumentFactory,
-    Zend\Config\Config,
-    ZendTest\Cloud\DocumentService\Adapter\SimpleDbTest,
-    ZendTest\Cloud\DocumentService\Adapter\WindowsAzureTest,
+use Zend\Cloud\DocumentService\Factory as DocumentFactory;
+use Zend\Config\Config;
+use ZendTest\Cloud\DocumentService\Adapter\SimpleDbTest;
+use ZendTest\Cloud\DocumentService\Adapter\WindowsAzureTest,
     PHPUnit_Framework_TestCase as PHPUnitTestCase;
 
 /**

diff --git a/tests/Zend/Cloud/DocumentService/TestCase.php b/tests/Zend/Cloud/DocumentService/TestCase.php
@@ -10,10 +10,10 @@
 
 namespace ZendTest\Cloud\DocumentService;
 
-use Zend\Cloud\DocumentService\Adapter,
-    Zend\Cloud\DocumentService\Document,
-    Zend\Cloud\DocumentService\Factory,
-    Zend\Cloud\DocumentService\QueryAdapter,
+use Zend\Cloud\DocumentService\Adapter;
+use Zend\Cloud\DocumentService\Document;
+use Zend\Cloud\DocumentService\Factory;
+use Zend\Cloud\DocumentService\QueryAdapter,
     PHPUnit_Framework_TestCase as PHPUnitTestCase;
 
 /**

diff --git a/tests/Zend/Cloud/Infrastructure/Adapter/Ec2OfflineTest.php b/tests/Zend/Cloud/Infrastructure/Adapter/Ec2OfflineTest.php
@@ -10,11 +10,11 @@
 
 namespace ZendTest\Cloud\Infrastructure\Adapter;
 
-use Zend\Http\Client as HttpClient,
-    Zend\Http\Client\Adapter\Test as HttpTest,
-    Zend\Cloud\Infrastructure\Adapter\Ec2,
-    Zend\Cloud\Infrastructure\Instance,
-    Zend\Cloud\Infrastructure\Factory as CloudFactory;
+use Zend\Http\Client as HttpClient;
+use Zend\Http\Client\Adapter\Test as HttpTest;
+use Zend\Cloud\Infrastructure\Adapter\Ec2;
+use Zend\Cloud\Infrastructure\Instance;
+use Zend\Cloud\Infrastructure\Factory as CloudFactory;
 
 class Ec2OfflineTest extends \PHPUnit_Framework_TestCase
 {

diff --git a/tests/Zend/Cloud/Infrastructure/Adapter/RackspaceOfflineTest.php b/tests/Zend/Cloud/Infrastructure/Adapter/RackspaceOfflineTest.php
@@ -10,11 +10,11 @@
 
 namespace ZendTest\Cloud\Infrastructure\Adapter;
 
-use Zend\Http\Client as HttpClient,
-    Zend\Http\Client\Adapter\Test as HttpTest,
-    Zend\Cloud\Infrastructure\Adapter\Rackspace,
-    Zend\Cloud\Infrastructure\Instance,
-    Zend\Cloud\Infrastructure\Factory as CloudFactory;
+use Zend\Http\Client as HttpClient;
+use Zend\Http\Client\Adapter\Test as HttpTest;
+use Zend\Cloud\Infrastructure\Adapter\Rackspace;
+use Zend\Cloud\Infrastructure\Instance;
+use Zend\Cloud\Infrastructure\Factory as CloudFactory;
 
 class RackspaceOfflineTest extends \PHPUnit_Framework_TestCase
 {

diff --git a/tests/Zend/Cloud/Infrastructure/FactoryTest.php b/tests/Zend/Cloud/Infrastructure/FactoryTest.php
@@ -10,10 +10,10 @@
 
 namespace ZendTest\Cloud\Infrastructure;
 
-use Zend\Config\Config,
-    Zend\Cloud\Infrastructure\Factory as CloudFactory,
-    ZendTest\Cloud\Infrastructure\Adapter\Ec2OfflineTest,
-    ZendTest\Cloud\Infrastructure\Adapter\RackspaceOfflineTest;
+use Zend\Config\Config;
+use Zend\Cloud\Infrastructure\Factory as CloudFactory;
+use ZendTest\Cloud\Infrastructure\Adapter\Ec2OfflineTest;
+use ZendTest\Cloud\Infrastructure\Adapter\RackspaceOfflineTest;
 
 /**
  * Test class for Zend_Cloud_Infrastructure_Factory

diff --git a/tests/Zend/Cloud/Infrastructure/TestCase.php b/tests/Zend/Cloud/Infrastructure/TestCase.php
@@ -10,8 +10,8 @@
 
 namespace ZendTest\Cloud\Infrastructure;
 
-use Zend\Cloud\Infrastructure\Adapter\AdapterInterface,
-    Zend\Cloud\Infrastructure\Instance;
+use Zend\Cloud\Infrastructure\Adapter\AdapterInterface;
+use Zend\Cloud\Infrastructure\Instance;
 
 /**
  * This class forces the adapter tests to implement tests for all methods on

diff --git a/tests/Zend/Cloud/QueueService/Adapter/SqsTest.php b/tests/Zend/Cloud/QueueService/Adapter/SqsTest.php
@@ -10,9 +10,9 @@
 
 namespace ZendTest\Cloud\QueueService\Adapter;
 
-use ZendTest\Cloud\QueueService\TestCase,
-    Zend\Cloud\QueueService\Adapter\Sqs,
-    Zend\Config\Config;
+use ZendTest\Cloud\QueueService\TestCase;
+use Zend\Cloud\QueueService\Adapter\Sqs;
+use Zend\Config\Config;
 
 /**
  * @category   Zend