Merge branch 'master' into issue#24

Conflicts: src/Cubiche/Core/Storage/InMemoryStorage.php
cubiche · Apr 29, 2016 · 5017b70 · 5017b70
2 parents 47e4de2 + 9ac4041
commit 5017b70
Show file tree

Hide file tree

Showing 16 changed files with 16 additions and 70 deletions.
diff --git a/Comparator.php b/Comparator.php
@@ -8,6 +8,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
+
 namespace Cubiche\Core\Comparable;
 
 /**
@@ -20,8 +21,6 @@ class Comparator extends AbstractComparator
 {
     /**
      * {@inheritdoc}
-     *
-     * @see \Cubiche\Core\Comparable\ComparatorInterface::acceptComparatorVisitor()
      */
     public function acceptComparatorVisitor(ComparatorVisitorInterface $visitor)
     {

diff --git a/ComparatorTrait.php b/ComparatorTrait.php
@@ -8,6 +8,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
+
 namespace Cubiche\Core\Comparable;
 
 use Cubiche\Core\Visitor\VisitorInterface;
@@ -37,8 +38,6 @@ public function __call($method, array $arguments)
 
     /**
      * {@inheritdoc}
-     *
-     * @see \Cubiche\Core\Comparable\ComparatorInterface::compare()
      */
     public function compare($a, $b)
     {
@@ -51,8 +50,6 @@ public function compare($a, $b)
 
     /**
      * {@inheritdoc}
-     *
-     * @see \Cubiche\Core\Comparable\ComparatorInterface::reverse()
      */
     public function reverse()
     {
@@ -61,8 +58,6 @@ public function reverse()
 
     /**
      * {@inheritdoc}
-     *
-     * @see \Cubiche\Core\Comparable\ComparatorInterface::orX()
      */
     public function orX(ComparatorInterface $other)
     {
@@ -71,8 +66,6 @@ public function orX(ComparatorInterface $other)
 
     /**
      * {@inheritdoc}
-     *
-     * @see \Cubiche\Core\Visitor\Visitee::accept()
      */
     public function accept(VisitorInterface $visitor)
     {

diff --git a/ComparatorVisitor.php b/ComparatorVisitor.php
@@ -8,6 +8,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
+
 namespace Cubiche\Core\Comparable;
 
 use Cubiche\Core\Visitor\Visitor;
@@ -22,8 +23,6 @@ abstract class ComparatorVisitor extends Visitor implements ComparatorVisitorInt
 {
     /**
      * {@inheritdoc}
-     *
-     * @see \Cubiche\Core\Visitor\Visitor::visit()
      */
     public function visit(VisiteeInterface $visitee)
     {

diff --git a/Custom.php b/Custom.php
@@ -8,6 +8,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
+
 namespace Cubiche\Core\Comparable;
 
 use Cubiche\Core\Delegate\Delegate;
@@ -34,8 +35,6 @@ public function __construct(callable $callable)
 
     /**
      * {@inheritdoc}
-     *
-     * @see \Cubiche\Core\Comparable\Comparator::compare()
      */
     public function compare($a, $b)
     {
@@ -44,8 +43,6 @@ public function compare($a, $b)
 
     /**
      * {@inheritdoc}
-     *
-     * @see \Cubiche\Core\Comparable\Comparator::acceptComparatorVisitor()
      */
     public function acceptComparatorVisitor(ComparatorVisitorInterface $visitor)
     {

diff --git a/MultiComparator.php b/MultiComparator.php
@@ -8,6 +8,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
+
 namespace Cubiche\Core\Comparable;
 
 /**
@@ -55,8 +56,6 @@ public function secondComparator()
 
     /**
      * {@inheritdoc}
-     *
-     * @see \Cubiche\Core\Comparable\ComparatorInterface::compare()
      */
     public function compare($a, $b)
     {
@@ -67,8 +66,6 @@ public function compare($a, $b)
 
     /**
      * {@inheritdoc}
-     *
-     * @see \Cubiche\Core\Comparable\ComparatorInterface::reverse()
      */
     public function reverse()
     {
@@ -77,8 +74,6 @@ public function reverse()
 
     /**
      * {@inheritdoc}
-     *
-     * @see \Cubiche\Core\Comparable\Comparator::acceptComparatorVisitor()
      */
     public function acceptComparatorVisitor(ComparatorVisitorInterface $visitor)
     {

diff --git a/ReverseComparator.php b/ReverseComparator.php
@@ -8,6 +8,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
+
 namespace Cubiche\Core\Comparable;
 
 /**
@@ -43,8 +44,6 @@ public function comparator()
 
     /**
      * {@inheritdoc}
-     *
-     * @see \Cubiche\Core\Comparable\ComparatorInterface::compare()
      */
     public function compare($a, $b)
     {
@@ -53,8 +52,6 @@ public function compare($a, $b)
 
     /**
      * {@inheritdoc}
-     *
-     * @see \Cubiche\Core\Comparable\ComparatorInterface::reverse()
      */
     public function reverse()
     {
@@ -63,8 +60,6 @@ public function reverse()
 
     /**
      * {@inheritdoc}
-     *
-     * @see \Cubiche\Core\Comparable\ComparatorInterface::acceptComparatorVisitor()
      */
     public function acceptComparatorVisitor(ComparatorVisitorInterface $visitor)
     {

diff --git a/SelectorComparator.php b/SelectorComparator.php
@@ -8,6 +8,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
+
 namespace Cubiche\Core\Comparable;
 
 use Cubiche\Core\Selector\SelectorInterface;
@@ -57,8 +58,6 @@ public function order()
 
     /**
      * {@inheritdoc}
-     *
-     * @see \Cubiche\Core\Comparable\ComparatorInterface::compare()
      */
     public function compare($a, $b)
     {
@@ -67,8 +66,6 @@ public function compare($a, $b)
 
     /**
      * {@inheritdoc}
-     *
-     * @see \Cubiche\Core\Comparable\ComparatorInterface::reverse()
      */
     public function reverse()
     {
@@ -77,8 +74,6 @@ public function reverse()
 
     /**
      * {@inheritdoc}
-     *
-     * @see \Cubiche\Core\Comparable\ComparatorInterface::acceptComparatorVisitor()
      */
     public function acceptComparatorVisitor(ComparatorVisitorInterface $visitor)
     {

diff --git a/Tests/Fixtures/ComparableObject.php b/Tests/Fixtures/ComparableObject.php
@@ -7,6 +7,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
+
 namespace Cubiche\Core\Comparable\Tests\Fixtures;
 
 use Cubiche\Core\Comparable\ComparableInterface;
@@ -43,8 +44,6 @@ public function value()
 
     /**
      * {@inheritdoc}
-     *
-     * @see \Cubiche\Core\Comparable\ComparableInterface::compareTo()
      */
     public function compareTo($other)
     {

diff --git a/Tests/Units/AbstractComparatorTestCase.php b/Tests/Units/AbstractComparatorTestCase.php
@@ -8,6 +8,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
+
 namespace Cubiche\Core\Comparable\Tests\Units;
 
 use Cubiche\Core\Comparable\AbstractComparator;
@@ -53,8 +54,6 @@ public function testMagicCall()
 
     /**
      * {@inheritdoc}
-     *
-     * @see \Cubiche\Core\Comparable\Tests\Units\ComparatorInterfaceTestCase::compareDataProvider()
      */
     protected function compareDataProvider()
     {

diff --git a/Tests/Units/ComparatorInterfaceTestCase.php b/Tests/Units/ComparatorInterfaceTestCase.php
@@ -8,6 +8,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
+
 namespace Cubiche\Core\Comparable\Tests\Units;
 
 use Cubiche\Core\Comparable\Comparator;
@@ -112,8 +113,6 @@ public function testMagicCall()
 
     /**
      * {@inheritdoc}
-     *
-     * @see \Cubiche\Core\Visitor\Tests\Units\VisiteeInterfaceTestCase::visitorInterface()
      */
     protected function visitorInterface()
     {
@@ -122,8 +121,6 @@ protected function visitorInterface()
 
     /**
      * {@inheritdoc}
-     *
-     * @see \Cubiche\Core\Visitor\Tests\Units\VisiteeInterfaceTestCase::acceptActualVisitorMethod()
      */
     protected function acceptActualVisitorMethod()
     {

diff --git a/Tests/Units/ComparatorTests.php b/Tests/Units/ComparatorTests.php
@@ -8,6 +8,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
+
 namespace Cubiche\Core\Comparable\Tests\Units;
 
 use Cubiche\Core\Comparable\Comparator;
@@ -22,8 +23,6 @@ class ComparatorTests extends AbstractComparatorTestCase
 {
     /**
      * {@inheritdoc}
-     *
-     * @see \Cubiche\Core\Visitor\Tests\Units\VisiteeInterfaceTestCase::shouldVisitMethod()
      */
     protected function shouldVisitMethod()
     {

diff --git a/Tests/Units/ComparatorVisitorTests.php b/Tests/Units/ComparatorVisitorTests.php
@@ -7,6 +7,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
+
 namespace Cubiche\Core\Comparable\Tests\Units;
 
 use Cubiche\Core\Comparable\ComparatorInterface;
@@ -21,8 +22,6 @@ class ComparatorVisitorTests extends VisitorTestCase
 {
     /**
      * {@inheritdoc}
-     *
-     * @see \Cubiche\Core\Visitor\Tests\Units\VisitorInterfaceTestCase::visiteeInterface()
      */
     protected function visiteeInterface()
     {
@@ -31,8 +30,6 @@ protected function visiteeInterface()
 
     /**
      * {@inheritdoc}
-     *
-     * @see \Cubiche\Core\Visitor\Tests\Units\VisitorInterfaceTestCase::shouldVisitMethod()
      */
     protected function shouldVisitMethod()
     {

diff --git a/Tests/Units/CustomTests.php b/Tests/Units/CustomTests.php
@@ -8,6 +8,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
+
 namespace Cubiche\Core\Comparable\Tests\Units;
 
 use Cubiche\Core\Comparable\Comparator;
@@ -22,8 +23,6 @@ class CustomTests extends AbstractComparatorTestCase
 {
     /**
      * {@inheritdoc}
-     *
-     * @see \Cubiche\Tests\TestCase::defaultConstructorArguments()
      */
     protected function defaultConstructorArguments()
     {
@@ -36,8 +35,6 @@ protected function defaultConstructorArguments()
 
     /**
      * {@inheritdoc}
-     *
-     * @see \Cubiche\Core\Comparable\Tests\Units\ComparatorInterfaceTestCase::compareDataProvider()
      */
     protected function compareDataProvider()
     {
@@ -50,8 +47,6 @@ protected function compareDataProvider()
 
     /**
      * {@inheritdoc}
-     *
-     * @see \Cubiche\Core\Visitor\Tests\Units\VisiteeInterfaceTestCase::shouldVisitMethod()
      */
     protected function shouldVisitMethod()
     {

diff --git a/Tests/Units/MultiComparatorTests.php b/Tests/Units/MultiComparatorTests.php
@@ -8,6 +8,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
+
 namespace Cubiche\Core\Comparable\Tests\Units;
 
 use Cubiche\Core\Comparable\Comparator;
@@ -23,8 +24,6 @@ class MultiComparatorTests extends AbstractComparatorTestCase
 {
     /**
      * {@inheritdoc}
-     *
-     * @see \Cubiche\Tests\TestCase::defaultConstructorArguments()
      */
     protected function defaultConstructorArguments()
     {
@@ -38,8 +37,6 @@ protected function defaultConstructorArguments()
 
     /**
      * {@inheritdoc}
-     *
-     * @see \Cubiche\Core\Comparable\Tests\Units\ComparatorInterfaceTestCase::compareDataProvider()
      */
     protected function compareDataProvider()
     {
@@ -54,8 +51,6 @@ protected function compareDataProvider()
 
     /**
      * {@inheritdoc}
-     *
-     * @see \Cubiche\Core\Visitor\Tests\Units\VisiteeInterfaceTestCase::shouldVisitMethod()
      */
     protected function shouldVisitMethod()
     {