Removing a useless dependency.

ben-challis · Nov 21, 2014 · 6bce7c2 · 6bce7c2
1 parent 511674b
commit 6bce7c2
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 51 deletions.
diff --git a/Raml/DocParser.php b/Raml/DocParser.php
@@ -7,14 +7,12 @@
 
 namespace GoIntegro\Bundle\HateoasBundle\Raml;
 
-// RAML.
-use Raml\Parser;
 // YAML.
 use Symfony\Component\Yaml\Yaml;
 // JSON.
 use GoIntegro\Bundle\HateoasBundle\Util\JsonCoder;
 
-class DocParser extends Parser
+class DocParser
 {
     use DereferencesIncludes;
 
@@ -44,9 +42,8 @@ public function __construct(JsonCoder $jsonCoder)
      */
     public function parse($filePath)
     {
-        $apiDef = parent::parse($filePath);
         $rawRaml = Yaml::parse($filePath);
-        $ramlDoc = new RamlDoc($apiDef, $rawRaml, $filePath);
+        $ramlDoc = new RamlDoc($rawRaml, $filePath);
 
         if (isset($rawRaml['schemas'])) {
             foreach ($rawRaml['schemas'] as $map) {

diff --git a/Raml/RamlDoc.php b/Raml/RamlDoc.php
@@ -7,9 +7,6 @@
 
 namespace GoIntegro\Bundle\HateoasBundle\Raml;
 
-// RAML.
-use Raml\ApiDefinition;
-
 class RamlDoc
 {
     const HTTP_OPTIONS = 'options',
@@ -45,10 +42,6 @@ class RamlDoc
         self::MEDIA_TYPE_JSON,
         self::MEDIA_TYPE_XML
     ];
-    /**
-     * @var ApiDefinition
-     */
-    public $apiDef;
     /**
      * @var array Read-only.
      */
@@ -67,15 +60,11 @@ class RamlDoc
     private $schemaMaps = [];
 
     /**
-     * @param $apiDef
      * @param array $rawRaml
      * @param string $fileName
      */
-    public function __construct(
-        ApiDefinition $apiDef, array $rawRaml, $fileName
-    )
+    public function __construct(array $rawRaml, $fileName)
     {
-        $this->apiDef = $apiDef;
         $this->rawRaml = $rawRaml;
         $this->fileName = $fileName;
         $this->fileDir = dirname($fileName);
@@ -120,21 +109,6 @@ public function getNamedSchema($name)
         return NULL;
     }
 
-    /**
-     * @param string $name
-     * @param array $args
-     */
-    public function __call($name, $args)
-    {
-        $method = [$this->apiDef, $name];
-
-        if (is_callable($method)) {
-            return call_user_func_array($method, $args);
-        } else {
-            throw new \BadMethodCallException("No such method here.");
-        }
-    }
-
     /**
      * @param string $method
      * @return boolean
@@ -193,8 +167,6 @@ public function isDefined($method, $path)
         return isset($raml[$method]);
     }
 
-
-
     /**
      * @param string $path
      * @param integer $case

diff --git a/Tests/Raml/RamlDocTest.php b/Tests/Raml/RamlDocTest.php
@@ -21,10 +21,9 @@ class RamlDocTest extends TestCase
     public function testCheckingWhetherRequestIsDefined()
     {
         /* Given... (Fixture) */
-        $apiDef = Stub::makeEmpty('Raml\ApiDefinition');
         // Quite justifiable.
         $rawRaml = Yaml::parse(__DIR__ . self::DEFAULT_SCHEMA_RAML);
-        $ramlDoc = new RamlDoc($apiDef, $rawRaml, self::DEFAULT_SCHEMA_RAML);
+        $ramlDoc = new RamlDoc($rawRaml, self::DEFAULT_SCHEMA_RAML);
         /* When... (Action) */
         $nay = $ramlDoc->isDefined(RamlDoc::HTTP_PUT, '/some-resources');
         $yeah = $ramlDoc->isDefined(RamlDoc::HTTP_PUT, '/some-resources/1');
@@ -40,10 +39,9 @@ public function testCheckingWhetherRequestIsDefined()
     public function testGettingAllowedMethodsForPath()
     {
         /* Given... (Fixture) */
-        $apiDef = Stub::makeEmpty('Raml\ApiDefinition');
         // Quite justifiable.
         $rawRaml = Yaml::parse(__DIR__ . self::DEFAULT_SCHEMA_RAML);
-        $ramlDoc = new RamlDoc($apiDef, $rawRaml, self::DEFAULT_SCHEMA_RAML);
+        $ramlDoc = new RamlDoc($rawRaml, self::DEFAULT_SCHEMA_RAML);
         /* When... (Action) */
         $allowedFiltered = $ramlDoc->getAllowedMethods('/some-resources');
         $allowedById = $ramlDoc->getAllowedMethods('/some-resources/1');

diff --git a/composer.json b/composer.json
@@ -19,16 +19,6 @@
             "homepage": "http://www.gointegro.com"
         }
     ],
-    "repositories": [
-        {
-            "type": "vcs",
-            "url": "https://github.com/skqr/php-raml-parser.git"
-        },
-        {
-            "type": "vcs",
-            "url": "https://github.com/skqr/ReverseRegex.git"
-        }
-    ],
     "require": {
         "php": ">=5.4.0",
         "symfony/framework-bundle": "*",
@@ -37,14 +27,12 @@
         "doctrine/orm": "*",
         "justinrainbow/json-schema": "*",
         "rhumsaa/uuid": "*",
-        "skqr/php-raml-parser": "dev-master",
         "predis/predis": "*"
     },
     "require-dev": {
         "phpunit/phpunit": "*",
         "phpdocumentor/phpdocumentor": "*",
-        "codeception/codeception": "*",
-        "skqr/reverse-regex": "dev-master"
+        "codeception/codeception": "*"
     },
     "autoload": {
         "psr-0": { "GoIntegro\\Bundle\\HateoasBundle": "" }