From 29e1a560ce06c3ac6f200692370192e858292a2a Mon Sep 17 00:00:00 2001
From: Matthieu Napoli <matthieu@mnapoli.fr>
Date: Thu, 18 Jul 2013 13:47:36 +0200
Subject: [PATCH] Moved classes for better namespaces

---
 .../{Parser => }/Model/IdSelector.php         |  2 +-
 .../{Parser => }/Model/MethodCall.php         |  2 +-
 .../{Parser => }/Model/NamedSelector.php      |  2 +-
 src/MetaModel/{Parser => }/Model/Node.php     |  4 +--
 .../{Parser => }/Model/PropertyAccess.php     |  2 +-
 src/MetaModel/Parser/IdSelectorParser.php     |  4 +--
 src/MetaModel/Parser/MethodCallParser.php     |  4 +--
 src/MetaModel/Parser/NamedSelectorParser.php  |  4 +--
 src/MetaModel/Parser/Parser.php               | 16 ++++++------
 src/MetaModel/Parser/PropertyAccessParser.php |  2 +-
 .../MetaModel/Parser/IdSelectorParserTest.php |  2 +-
 .../MetaModel/Parser/MethodCallParserTest.php |  2 +-
 .../Parser/NamedSelectorParserTest.php        |  2 +-
 .../UnitTest/MetaModel/Parser/ParserTest.php  | 26 +++++++++----------
 .../Parser/PropertyAccessParserTest.php       |  4 +--
 15 files changed, 39 insertions(+), 39 deletions(-)
 rename src/MetaModel/{Parser => }/Model/IdSelector.php (96%)
 rename src/MetaModel/{Parser => }/Model/MethodCall.php (97%)
 rename src/MetaModel/{Parser => }/Model/NamedSelector.php (95%)
 rename src/MetaModel/{Parser => }/Model/Node.php (76%)
 rename src/MetaModel/{Parser => }/Model/PropertyAccess.php (97%)

diff --git a/src/MetaModel/Parser/Model/IdSelector.php b/src/MetaModel/Model/IdSelector.php
similarity index 96%
rename from src/MetaModel/Parser/Model/IdSelector.php
rename to src/MetaModel/Model/IdSelector.php
index 4103092..d23de75 100755
--- a/src/MetaModel/Parser/Model/IdSelector.php
+++ b/src/MetaModel/Model/IdSelector.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace MetaModel\Parser\Model;
+namespace MetaModel\Model;
 
 use MetaModel\MetaModel;
 
diff --git a/src/MetaModel/Parser/Model/MethodCall.php b/src/MetaModel/Model/MethodCall.php
similarity index 97%
rename from src/MetaModel/Parser/Model/MethodCall.php
rename to src/MetaModel/Model/MethodCall.php
index 8b9f61a..2158157 100755
--- a/src/MetaModel/Parser/Model/MethodCall.php
+++ b/src/MetaModel/Model/MethodCall.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace MetaModel\Parser\Model;
+namespace MetaModel\Model;
 
 use MetaModel\MetaModel;
 
diff --git a/src/MetaModel/Parser/Model/NamedSelector.php b/src/MetaModel/Model/NamedSelector.php
similarity index 95%
rename from src/MetaModel/Parser/Model/NamedSelector.php
rename to src/MetaModel/Model/NamedSelector.php
index f1486dc..517a7d8 100755
--- a/src/MetaModel/Parser/Model/NamedSelector.php
+++ b/src/MetaModel/Model/NamedSelector.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace MetaModel\Parser\Model;
+namespace MetaModel\Model;
 
 use MetaModel\MetaModel;
 
diff --git a/src/MetaModel/Parser/Model/Node.php b/src/MetaModel/Model/Node.php
similarity index 76%
rename from src/MetaModel/Parser/Model/Node.php
rename to src/MetaModel/Model/Node.php
index dbbc378..74a5d45 100755
--- a/src/MetaModel/Parser/Model/Node.php
+++ b/src/MetaModel/Model/Node.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace MetaModel\Parser\Model;
+namespace MetaModel\Model;
 
 use MetaModel\MetaModel;
 
@@ -13,7 +13,7 @@ interface Node
 {
     /**
      * @param MetaModel $metaModel
-     * @return Node|mixed
+     * @return \MetaModel\Model\Node|mixed
      */
     public function execute(MetaModel $metaModel);
 }
diff --git a/src/MetaModel/Parser/Model/PropertyAccess.php b/src/MetaModel/Model/PropertyAccess.php
similarity index 97%
rename from src/MetaModel/Parser/Model/PropertyAccess.php
rename to src/MetaModel/Model/PropertyAccess.php
index 97901c5..94bf04c 100755
--- a/src/MetaModel/Parser/Model/PropertyAccess.php
+++ b/src/MetaModel/Model/PropertyAccess.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace MetaModel\Parser\Model;
+namespace MetaModel\Model;
 
 use MetaModel\MetaModel;
 
diff --git a/src/MetaModel/Parser/IdSelectorParser.php b/src/MetaModel/Parser/IdSelectorParser.php
index fe75943..730dfb0 100755
--- a/src/MetaModel/Parser/IdSelectorParser.php
+++ b/src/MetaModel/Parser/IdSelectorParser.php
@@ -3,7 +3,7 @@
 namespace MetaModel\Parser;
 
 use MetaModel\Parser\ParsingException;
-use MetaModel\Parser\Model\IdSelector;
+use MetaModel\Model\IdSelector;
 
 /**
  * ID selector parser
@@ -21,7 +21,7 @@ class IdSelectorParser
      * @param string $expression
      *
      * @throws ParsingException
-     * @return IdSelector
+     * @return \MetaModel\Model\IdSelector
      */
     public function parse($expression)
     {
diff --git a/src/MetaModel/Parser/MethodCallParser.php b/src/MetaModel/Parser/MethodCallParser.php
index d8ac669..e11ace6 100755
--- a/src/MetaModel/Parser/MethodCallParser.php
+++ b/src/MetaModel/Parser/MethodCallParser.php
@@ -2,7 +2,7 @@
 
 namespace MetaModel\Parser;
 
-use MetaModel\Parser\Model\MethodCall;
+use MetaModel\Model\MethodCall;
 use MetaModel\Parser\ParsingException;
 
 /**
@@ -21,7 +21,7 @@ class MethodCallParser
      * @param string $expression
      *
      * @throws ParsingException
-     * @return MethodCall
+     * @return \MetaModel\Model\MethodCall
      */
     public function parse($expression)
     {
diff --git a/src/MetaModel/Parser/NamedSelectorParser.php b/src/MetaModel/Parser/NamedSelectorParser.php
index e495188..75f8c59 100755
--- a/src/MetaModel/Parser/NamedSelectorParser.php
+++ b/src/MetaModel/Parser/NamedSelectorParser.php
@@ -2,7 +2,7 @@
 
 namespace MetaModel\Parser;
 
-use MetaModel\Parser\Model\NamedSelector;
+use MetaModel\Model\NamedSelector;
 use MetaModel\Parser\ParsingException;
 
 /**
@@ -20,7 +20,7 @@ class NamedSelectorParser
      * @param string $expression
      *
      * @throws ParsingException
-     * @return NamedSelector
+     * @return \MetaModel\Model\NamedSelector
      */
     public function parse($expression)
     {
diff --git a/src/MetaModel/Parser/Parser.php b/src/MetaModel/Parser/Parser.php
index 0b1defb..6922d15 100755
--- a/src/MetaModel/Parser/Parser.php
+++ b/src/MetaModel/Parser/Parser.php
@@ -4,10 +4,10 @@
 
 use JMS\Parser\AbstractParser;
 use JMS\Parser\SimpleLexer;
-use MetaModel\Parser\Model\MethodCall;
-use MetaModel\Parser\Model\Node;
-use MetaModel\Parser\Model\PropertyAccess;
-use MetaModel\Parser\Model\IdSelector;
+use MetaModel\Model\MethodCall;
+use MetaModel\Model\Node;
+use MetaModel\Model\PropertyAccess;
+use MetaModel\Model\IdSelector;
 
 /**
  * MetaModel expression parser
@@ -82,7 +82,7 @@ function($part) use ($idSelectorParser, $namedSelectorParser, $propertyAccessPar
     /**
      *
      * @throws ParsingException
-     * @return Node
+     * @return \MetaModel\Model\Node
      */
     protected function parseInternal()
     {
@@ -101,20 +101,20 @@ protected function parseInternal()
             $node = $idSelectorParser->parse($part);
         } else {
             $part = $this->match(self::T_NAMED_SELECTOR);
-            /** @var Node $node */
+            /** @var \MetaModel\Model\Node $node */
             $node = $namedSelectorParser->parse($part);
         }
 
         while ($this->lexer->isNextAny([self::T_PROPERTY_ACCESS, self::T_METHOD_CALL])) {
             if ($this->lexer->isNext(self::T_PROPERTY_ACCESS)) {
                 $part = $this->match(self::T_PROPERTY_ACCESS);
-                /** @var PropertyAccess $propertyAccess */
+                /** @var \MetaModel\Model\PropertyAccess $propertyAccess */
                 $propertyAccess = $propertyAccessParser->parse($part);
                 $propertyAccess->setSubNode($node);
                 $node = $propertyAccess;
             } elseif ($this->lexer->isNext(self::T_METHOD_CALL)) {
                 $part = $this->match(self::T_METHOD_CALL);
-                /** @var MethodCall $methodCall */
+                /** @var \MetaModel\Model\MethodCall $methodCall */
                 $methodCall = $methodCallParser->parse($part);
                 $methodCall->setSubNode($node);
                 $node = $methodCall;
diff --git a/src/MetaModel/Parser/PropertyAccessParser.php b/src/MetaModel/Parser/PropertyAccessParser.php
index f148a87..aba784f 100755
--- a/src/MetaModel/Parser/PropertyAccessParser.php
+++ b/src/MetaModel/Parser/PropertyAccessParser.php
@@ -2,7 +2,7 @@
 
 namespace MetaModel\Parser;
 
-use MetaModel\Parser\Model\PropertyAccess;
+use MetaModel\Model\PropertyAccess;
 use MetaModel\Parser\ParsingException;
 
 /**
diff --git a/tests/UnitTest/MetaModel/Parser/IdSelectorParserTest.php b/tests/UnitTest/MetaModel/Parser/IdSelectorParserTest.php
index 25a5ac2..48efddd 100755
--- a/tests/UnitTest/MetaModel/Parser/IdSelectorParserTest.php
+++ b/tests/UnitTest/MetaModel/Parser/IdSelectorParserTest.php
@@ -2,7 +2,7 @@
 
 namespace UnitTest\MetaModel\Parser;
 
-use MetaModel\Parser\Model\IdSelector;
+use MetaModel\Model\IdSelector;
 use MetaModel\Parser\IdSelectorParser;
 
 class IdSelectorParserTest extends \PHPUnit_Framework_TestCase
diff --git a/tests/UnitTest/MetaModel/Parser/MethodCallParserTest.php b/tests/UnitTest/MetaModel/Parser/MethodCallParserTest.php
index be906d8..7518377 100755
--- a/tests/UnitTest/MetaModel/Parser/MethodCallParserTest.php
+++ b/tests/UnitTest/MetaModel/Parser/MethodCallParserTest.php
@@ -3,7 +3,7 @@
 namespace UnitTest\MetaModel\Parser;
 
 use MetaModel\Parser\MethodCallParser;
-use MetaModel\Parser\Model\MethodCall;
+use MetaModel\Model\MethodCall;
 
 class MethodCallParserTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/UnitTest/MetaModel/Parser/NamedSelectorParserTest.php b/tests/UnitTest/MetaModel/Parser/NamedSelectorParserTest.php
index a362615..6f7df8d 100755
--- a/tests/UnitTest/MetaModel/Parser/NamedSelectorParserTest.php
+++ b/tests/UnitTest/MetaModel/Parser/NamedSelectorParserTest.php
@@ -2,7 +2,7 @@
 
 namespace UnitTest\MetaModel\Parser;
 
-use MetaModel\Parser\Model\NamedSelector;
+use MetaModel\Model\NamedSelector;
 use MetaModel\Parser\NamedSelectorParser;
 
 class NamedSelectorParserTest extends \PHPUnit_Framework_TestCase
diff --git a/tests/UnitTest/MetaModel/Parser/ParserTest.php b/tests/UnitTest/MetaModel/Parser/ParserTest.php
index 15d1196..4f2753a 100755
--- a/tests/UnitTest/MetaModel/Parser/ParserTest.php
+++ b/tests/UnitTest/MetaModel/Parser/ParserTest.php
@@ -2,10 +2,10 @@
 
 namespace UnitTest\MetaModel\Parser;
 
-use MetaModel\Parser\Model\MethodCall;
-use MetaModel\Parser\Model\NamedSelector;
-use MetaModel\Parser\Model\PropertyAccess;
-use MetaModel\Parser\Model\IdSelector;
+use MetaModel\Model\MethodCall;
+use MetaModel\Model\NamedSelector;
+use MetaModel\Model\PropertyAccess;
+use MetaModel\Model\IdSelector;
 use MetaModel\Parser\Parser;
 
 class ParserTest extends \PHPUnit_Framework_TestCase
@@ -14,7 +14,7 @@ public function testParseIdSelector()
     {
         $parser = Parser::create();
 
-        /** @var IdSelector $ast */
+        /** @var \MetaModel\Model\IdSelector $ast */
         $ast = $parser->parse('Article(1)');
 
         $this->assertTrue($ast instanceof IdSelector);
@@ -37,7 +37,7 @@ public function testParsePropertyAccess()
     {
         $parser = Parser::create();
 
-        /** @var PropertyAccess $ast */
+        /** @var \MetaModel\Model\PropertyAccess $ast */
         $ast = $parser->parse('Article(1).id');
 
         $this->assertTrue($ast instanceof PropertyAccess);
@@ -53,7 +53,7 @@ public function testParseRecursivePropertyAccess()
     {
         $parser = Parser::create();
 
-        /** @var PropertyAccess $ast */
+        /** @var \MetaModel\Model\PropertyAccess $ast */
         $ast = $parser->parse('Article(1).foo.bar');
 
         $this->assertTrue($ast instanceof PropertyAccess);
@@ -65,7 +65,7 @@ public function testParseRecursivePropertyAccess()
         $this->assertEquals('foo', $subNode->getProperty());
 
         $subNode = $subNode->getSubNode();
-        /** @var IdSelector $subNode */
+        /** @var \MetaModel\Model\IdSelector $subNode */
         $this->assertTrue($subNode instanceof IdSelector);
         $this->assertEquals('Article', $subNode->getName());
         $this->assertEquals(1, $subNode->getId());
@@ -75,7 +75,7 @@ public function testParseMethodCall()
     {
         $parser = Parser::create();
 
-        /** @var MethodCall $ast */
+        /** @var \MetaModel\Model\MethodCall $ast */
         $ast = $parser->parse('Article(1).getId()');
 
         $this->assertTrue($ast instanceof MethodCall);
@@ -91,13 +91,13 @@ public function testParseRecursiveMethodCall()
     {
         $parser = Parser::create();
 
-        /** @var MethodCall $ast */
+        /** @var \MetaModel\Model\MethodCall $ast */
         $ast = $parser->parse('Article(1).foo().bar()');
 
         $this->assertTrue($ast instanceof MethodCall);
         $this->assertEquals('bar', $ast->getMethod());
 
-        /** @var MethodCall $subNode */
+        /** @var \MetaModel\Model\MethodCall $subNode */
         $subNode = $ast->getSubNode();
         $this->assertTrue($subNode instanceof MethodCall);
         $this->assertEquals('foo', $subNode->getMethod());
@@ -113,7 +113,7 @@ public function testParseMixedPropertyAccessMethodCalls1()
     {
         $parser = Parser::create();
 
-        /** @var PropertyAccess $ast */
+        /** @var \MetaModel\Model\PropertyAccess $ast */
         $ast = $parser->parse('Article(1).foo().bar');
 
         $this->assertTrue($ast instanceof PropertyAccess);
@@ -135,7 +135,7 @@ public function testParseMixedPropertyAccessMethodCalls2()
     {
         $parser = Parser::create();
 
-        /** @var MethodCall $ast */
+        /** @var \MetaModel\Model\MethodCall $ast */
         $ast = $parser->parse('Article(1).foo.bar()');
 
         $this->assertTrue($ast instanceof MethodCall);
diff --git a/tests/UnitTest/MetaModel/Parser/PropertyAccessParserTest.php b/tests/UnitTest/MetaModel/Parser/PropertyAccessParserTest.php
index a951b13..f2d4451 100755
--- a/tests/UnitTest/MetaModel/Parser/PropertyAccessParserTest.php
+++ b/tests/UnitTest/MetaModel/Parser/PropertyAccessParserTest.php
@@ -2,8 +2,8 @@
 
 namespace UnitTest\MetaModel\Parser;
 
-use MetaModel\Parser\Model\PropertyAccess;
-use MetaModel\Parser\Model\IdSelector;
+use MetaModel\Model\PropertyAccess;
+use MetaModel\Model\IdSelector;
 use MetaModel\Parser\PropertyAccessParser;
 
 class PropertyAccessParserTest extends \PHPUnit_Framework_TestCase