Removed some line duplication issues.

gsomoza · Jul 13, 2015 · 769628d · 769628d
1 parent 616abd6
commit 769628d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/lib/Version/Collection/LinkedVersions.php b/lib/Version/Collection/LinkedVersions.php
@@ -40,9 +40,8 @@ class LinkedVersions extends SortableVersions
      */
     public function isAcceptable($version)
     {
-        parent::isAcceptable($version);
         /** @var Version $version */
-        if (!$version->hasMigration()) {
+        if (parent::isAcceptable($version) && !$version->hasMigration()) {
             throw new MigrationMissingException(sprintf(
                 'Version "%s" must be associated with a Migration in order to be accepted into this collection.',
                 $version->getId()

diff --git a/lib/Version/Collection/MigratedVersions.php b/lib/Version/Collection/MigratedVersions.php
@@ -36,9 +36,8 @@ class MigratedVersions extends SortableVersions
      */
     public function isAcceptable($version)
     {
-        parent::isAcceptable($version);
         /** @var Version $version */
-        if (!$version->isMigrated()) {
+        if (parent::isAcceptable($version) && !$version->isMigrated()) {
             throw new CollectionException(sprintf(
                 'Version "%s" must be migrated in order to be accepted into this collection.',
                 $version->getId()

diff --git a/lib/Version/Collection/SortableVersions.php b/lib/Version/Collection/SortableVersions.php
@@ -42,9 +42,8 @@ class SortableVersions extends IndexedVersions
      */
     public function isAcceptable($version)
     {
-        parent::isAcceptable($version);
         /** @var Version $version */
-        if ($this->has($version->getId())) {
+        if (parent::isAcceptable($version) && $this->has($version->getId())) {
             throw new CollectionException(
                 sprintf('Item with id "%s" already exists', $version->getId())
             );