fix api uses

apioo · Mar 29, 2016 · 95f42c1 · 95f42c1
1 parent 8fd60ee
commit 95f42c1
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 16 deletions.
diff --git a/library/PSX/Framework/Console/ResourceCommand.php b/library/PSX/Framework/Console/ResourceCommand.php
@@ -21,10 +21,9 @@
 namespace PSX\Framework\Console;
 
 use PSX\Api\Resource;
-use PSX\Api\Resource\Generator;
-use PSX\Api\Resource\ListingInterface;
+use PSX\Api\Generator;
+use PSX\Api\ListingInterface;
 use PSX\Data\ExporterInterface;
-use PSX\Data\Processor;
 use PSX\Framework\Config\Config;
 use RuntimeException;
 use Symfony\Component\Console\Command\Command;

diff --git a/library/PSX/Framework/Controller/AnnotationApiAbstract.php b/library/PSX/Framework/Controller/AnnotationApiAbstract.php
@@ -20,7 +20,7 @@
 
 namespace PSX\Framework\Controller;
 
-use PSX\Api\Resource\Parser;
+use PSX\Api\Parser;
 use PSX\Framework\Loader\Context;
 
 /**

diff --git a/library/PSX/Framework/Controller/Generator/RamlController.php b/library/PSX/Framework/Controller/Generator/RamlController.php
@@ -21,8 +21,8 @@
 namespace PSX\Framework\Controller\Generator;
 
 use PSX\Api\Resource;
-use PSX\Api\Resource\Generator;
-use PSX\Api\Resource\Util\Inflection;
+use PSX\Api\Generator;
+use PSX\Api\Util\Inflection;
 use PSX\Framework\Controller\ControllerAbstract;
 use PSX\Http\Exception as HttpException;
 
@@ -37,7 +37,7 @@ class RamlController extends ControllerAbstract
 {
     /**
      * @Inject
-     * @var \PSX\Api\Resource\ListingInterface
+     * @var \PSX\Api\ListingInterface
      */
     protected $resourceListing;
 

diff --git a/library/PSX/Framework/Controller/Generator/SwaggerController.php b/library/PSX/Framework/Controller/Generator/SwaggerController.php
@@ -21,8 +21,8 @@
 namespace PSX\Framework\Controller\Generator;
 
 use PSX\Api\Resource;
-use PSX\Api\Resource\Generator;
-use PSX\Api\Resource\Util\Inflection;
+use PSX\Api\Generator;
+use PSX\Api\Util\Inflection;
 use PSX\Data\Exporter;
 use PSX\Framework\Controller\ControllerAbstract;
 use PSX\Data\WriterInterface;
@@ -41,7 +41,7 @@ class SwaggerController extends ControllerAbstract
 {
     /**
      * @Inject
-     * @var \PSX\Api\Resource\ListingInterface
+     * @var \PSX\Api\ListingInterface
      */
     protected $resourceListing;
 

diff --git a/library/PSX/Framework/Controller/Tool/DocumentationController.php b/library/PSX/Framework/Controller/Tool/DocumentationController.php
@@ -21,7 +21,7 @@
 namespace PSX\Framework\Controller\Tool;
 
 use PSX\Api\Resource;
-use PSX\Api\Resource\Generator;
+use PSX\Api\Generator;
 use PSX\Framework\Controller\ApiAbstract;
 use PSX\Data\Record;
 use PSX\Schema\Generator as SchemaGenerator;
@@ -39,7 +39,7 @@ class DocumentationController extends ApiAbstract
 {
     /**
      * @Inject
-     * @var \PSX\Api\Resource\ListingInterface
+     * @var \PSX\Api\ListingInterface
      */
     protected $resourceListing;
 

diff --git a/library/PSX/Framework/Exception/Converter.php b/library/PSX/Framework/Exception/Converter.php
@@ -24,7 +24,8 @@
 use PSX\Framework\DisplayException;
 use PSX\Framework\Template\ErrorException;
 use PSX\Model\Common\Error;
-use PSX\Schema\ValidationException;
+use PSX\Schema;
+use PSX\Validate;
 
 /**
  * Converter
@@ -80,7 +81,7 @@ public function convert(Exception $exception)
         } else {
             // if we have an display exception we can use the error message else
             // we hide the message with an general error message
-            if ($exception instanceof DisplayException || $exception instanceof ValidationException) {
+            if ($exception instanceof DisplayException || $exception instanceof Schema\ValidationException || $exception instanceof Validate\ValidationException) {
                 $message = $exception->getMessage();
             } else {
                 $message = 'The server encountered an internal error and was unable to complete your request.';

diff --git a/library/PSX/Framework/Tests/Controller/Foo/Application/SchemaApi/PropertyRamlController.php b/library/PSX/Framework/Tests/Controller/Foo/Application/SchemaApi/PropertyRamlController.php
@@ -20,7 +20,7 @@
 
 namespace PSX\Framework\Tests\Controller\Foo\Application\SchemaApi;
 
-use PSX\Api\Resource\Parser;
+use PSX\Api\Parser;
 use PSX\Api\Resource;
 use PSX\Framework\Controller\SchemaApiAbstract;
 use PSX\Framework\Loader\Context;

diff --git a/library/PSX/Framework/Tests/Controller/Generator/WsdlControllerTest.php b/library/PSX/Framework/Tests/Controller/Generator/WsdlControllerTest.php
@@ -303,7 +303,7 @@ public function testWsdlSchema()
         $dom = new DOMDocument();
         $dom->loadXML($wsdl);
 
-        $result = $dom->schemaValidate(__DIR__ . '/../../../../Api/Tests/Resource/Generator/Wsdl/wsdl1.xsd');
+        $result = $dom->schemaValidate(__DIR__ . '/../../../../Api/Tests/Generator/Wsdl/wsdl1.xsd');
 
         $this->assertTrue($result);
     }