fix exception message(s), clarify some conditionals

inspire-develop · Nov 12, 2019 · 73f4624 · 73f4624
1 parent 7a84d01
commit 73f4624
Showing 1 changed file with 19 additions and 9 deletions.
diff --git a/src/PackageSelection/PackageSelection.php b/src/PackageSelection/PackageSelection.php
@@ -154,7 +154,9 @@ public function select(Composer $composer, bool $verbose): array
 
             if (0 === count($repos)) {
                 throw new \InvalidArgumentException(sprintf('Specified repository url "%s" does not exist.', $this->repositoryFilter));
-            } elseif (count($repos) > 1) {
+            }
+
+            if (count($repos) > 1) {
                 throw new \InvalidArgumentException(sprintf('Found more than one repository for url "%s".', $this->repositoryFilter));
             }
         }
@@ -163,9 +165,17 @@ public function select(Composer $composer, bool $verbose): array
             $repos = $this->filterPackages($repos);
 
             if (0 === count($repos)) {
-                throw new \InvalidArgumentException(sprintf('Specified package name "%s" does not exist.', $this->packagesFilter));
-            } elseif (count($repos) > 1) {
-                throw new \InvalidArgumentException(sprintf('Found more than one package name "%s".', $this->packagesFilter));
+                throw new \InvalidArgumentException(sprintf(
+                    'Could not find any package(s) matching: %s',
+                    implode(', ', $this->packagesFilter)
+                ));
+            }
+
+            if (count($repos) > 1) {
+                throw new \InvalidArgumentException(sprintf(
+                    'Found more than one package matching: %s',
+                    implode(', ', $this->packagesFilter)
+                ));
             }
         }
 
@@ -377,7 +387,7 @@ private function createStripHostsPatterns($stripHostsConfig)
             } else {
                 $mask = (int) $mask;
 
-                if ($mask < 0 || 'ipv4' === $type && $mask > 32 || 'ipv6' === $type && $mask > 128) {
+                if ($mask < 0 || ('ipv4' === $type && $mask > 32) || ('ipv6' === $type && $mask > 128)) {
                     continue;
                 }
             }
@@ -464,10 +474,10 @@ private function matchStripHostsPatterns(string $url): bool
             @list($type, $host, $mask) = $pattern;
 
             if ('/local' === $type) {
-                if ('name' === $urltype && 'localhost' === strtolower($url)
-                    || ('ipv4' === $urltype || 'ipv6' === $urltype)
-                    && false === filter_var($url, FILTER_VALIDATE_IP, FILTER_FLAG_NO_RES_RANGE)
-                ) {
+                if (('name' === $urltype && 'localhost' === strtolower($url)) || (
+                    ('ipv4' === $urltype || 'ipv6' === $urltype) &&
+                    false === filter_var($url, FILTER_VALIDATE_IP, FILTER_FLAG_NO_RES_RANGE)
+                )) {
                     return true;
                 }
             } elseif ('/private' === $type) {