@@ -22,16 +22,14 @@ |
||
| 22 | 22 | * |
| 23 | 23 | * @psalm-immutable |
| 24 | 24 | */ |
| 25 | -final class IntegerRange extends Integer implements PseudoType |
|
| 26 | -{ |
|
| 25 | +final class IntegerRange extends Integer implements PseudoType { |
|
| 27 | 26 | /** @var string */ |
| 28 | 27 | private $minValue; |
| 29 | 28 | |
| 30 | 29 | /** @var string */ |
| 31 | 30 | private $maxValue; |
| 32 | 31 | |
| 33 | - public function __construct(string $minValue, string $maxValue) |
|
| 34 | - { |
|
| 32 | + public function __construct(string $minValue, string $maxValue) { |
|
| 35 | 33 | $this->minValue = $minValue; |
| 36 | 34 | $this->maxValue = $maxValue; |
| 37 | 35 | } |
@@ -24,15 +24,13 @@ |
||
| 24 | 24 | * |
| 25 | 25 | * @psalm-immutable |
| 26 | 26 | */ |
| 27 | -final class List_ extends Array_ implements PseudoType |
|
| 28 | -{ |
|
| 27 | +final class List_ extends Array_ implements PseudoType { |
|
| 29 | 28 | public function underlyingType(): Type |
| 30 | 29 | { |
| 31 | 30 | return new Array_(); |
| 32 | 31 | } |
| 33 | 32 | |
| 34 | - public function __construct(?Type $valueType = null) |
|
| 35 | - { |
|
| 33 | + public function __construct(?Type $valueType = null) { |
|
| 36 | 34 | parent::__construct($valueType, new Integer()); |
| 37 | 35 | } |
| 38 | 36 | |
@@ -42,8 +42,7 @@ |
||
| 42 | 42 | /** |
| 43 | 43 | * @deprecated |
| 44 | 44 | */ |
| 45 | -class Inflector |
|
| 46 | -{ |
|
| 45 | +class Inflector { |
|
| 47 | 46 | /** |
| 48 | 47 | * @var LanguageInflectorFactory|null |
| 49 | 48 | */ |
@@ -26,8 +26,7 @@ discard block |
||
| 26 | 26 | * |
| 27 | 27 | * @author Yanick Witschi <[email protected]> |
| 28 | 28 | */ |
| 29 | -class PoolOptimizer |
|
| 30 | -{ |
|
| 29 | +class PoolOptimizer { |
|
| 31 | 30 | /** |
| 32 | 31 | * @var PolicyInterface |
| 33 | 32 | */ |
@@ -63,16 +62,14 @@ discard block |
||
| 63 | 62 | */ |
| 64 | 63 | private $removedVersionsByPackage = array(); |
| 65 | 64 | |
| 66 | - public function __construct(PolicyInterface $policy) |
|
| 67 | - { |
|
| 65 | + public function __construct(PolicyInterface $policy) { |
|
| 68 | 66 | $this->policy = $policy; |
| 69 | 67 | } |
| 70 | 68 | |
| 71 | 69 | /** |
| 72 | 70 | * @return Pool |
| 73 | 71 | */ |
| 74 | - public function optimize(Request $request, Pool $pool) |
|
| 75 | - { |
|
| 72 | + public function optimize(Request $request, Pool $pool) { |
|
| 76 | 73 | $this->prepare($request, $pool); |
| 77 | 74 | |
| 78 | 75 | $this->optimizeByIdenticalDependencies($request, $pool); |
@@ -99,8 +96,7 @@ discard block |
||
| 99 | 96 | /** |
| 100 | 97 | * @return void |
| 101 | 98 | */ |
| 102 | - private function prepare(Request $request, Pool $pool) |
|
| 103 | - { |
|
| 99 | + private function prepare(Request $request, Pool $pool) { |
|
| 104 | 100 | $irremovablePackageConstraintGroups = array(); |
| 105 | 101 | |
| 106 | 102 | // Mark fixed or locked packages as irremovable |
@@ -155,8 +151,7 @@ discard block |
||
| 155 | 151 | /** |
| 156 | 152 | * @return void |
| 157 | 153 | */ |
| 158 | - private function markPackageIrremovable(BasePackage $package) |
|
| 159 | - { |
|
| 154 | + private function markPackageIrremovable(BasePackage $package) { |
|
| 160 | 155 | $this->irremovablePackages[$package->id] = true; |
| 161 | 156 | if ($package instanceof AliasPackage) { |
| 162 | 157 | // recursing here so aliasesPerPackage for the aliasOf can be checked |
@@ -173,8 +168,7 @@ discard block |
||
| 173 | 168 | /** |
| 174 | 169 | * @return Pool Optimized pool |
| 175 | 170 | */ |
| 176 | - private function applyRemovalsToPool(Pool $pool) |
|
| 177 | - { |
|
| 171 | + private function applyRemovalsToPool(Pool $pool) { |
|
| 178 | 172 | $packages = array(); |
| 179 | 173 | $removedVersions = array(); |
| 180 | 174 | foreach ($pool->getPackages() as $package) { |
@@ -193,8 +187,7 @@ discard block |
||
| 193 | 187 | /** |
| 194 | 188 | * @return void |
| 195 | 189 | */ |
| 196 | - private function optimizeByIdenticalDependencies(Request $request, Pool $pool) |
|
| 197 | - { |
|
| 190 | + private function optimizeByIdenticalDependencies(Request $request, Pool $pool) { |
|
| 198 | 191 | $identicalDefinitionsPerPackage = array(); |
| 199 | 192 | $packageIdenticalDefinitionLookup = array(); |
| 200 | 193 | |
@@ -279,8 +272,7 @@ discard block |
||
| 279 | 272 | /** |
| 280 | 273 | * @return string |
| 281 | 274 | */ |
| 282 | - private function calculateDependencyHash(BasePackage $package) |
|
| 283 | - { |
|
| 275 | + private function calculateDependencyHash(BasePackage $package) { |
|
| 284 | 276 | $hash = ''; |
| 285 | 277 | |
| 286 | 278 | $hashRelevantLinks = array( |
@@ -323,8 +315,7 @@ discard block |
||
| 323 | 315 | * @param int $id |
| 324 | 316 | * @return void |
| 325 | 317 | */ |
| 326 | - private function markPackageForRemoval($id) |
|
| 327 | - { |
|
| 318 | + private function markPackageForRemoval($id) { |
|
| 328 | 319 | // We are not allowed to remove packages if they have been marked as irremovable |
| 329 | 320 | if (isset($this->irremovablePackages[$id])) { |
| 330 | 321 | throw new \LogicException('Attempted removing a package which was previously marked irremovable'); |
@@ -338,8 +329,7 @@ discard block |
||
| 338 | 329 | * @param array<int, array<string, array{groupHash: string, dependencyHash: string}>> $packageIdenticalDefinitionLookup |
| 339 | 330 | * @return void |
| 340 | 331 | */ |
| 341 | - private function keepPackage(BasePackage $package, $identicalDefinitionsPerPackage, $packageIdenticalDefinitionLookup) |
|
| 342 | - { |
|
| 332 | + private function keepPackage(BasePackage $package, $identicalDefinitionsPerPackage, $packageIdenticalDefinitionLookup) { |
|
| 343 | 333 | unset($this->packagesToRemove[$package->id]); |
| 344 | 334 | |
| 345 | 335 | if ($package instanceof AliasPackage) { |
@@ -390,8 +380,7 @@ discard block |
||
| 390 | 380 | * |
| 391 | 381 | * @return void |
| 392 | 382 | */ |
| 393 | - private function optimizeImpossiblePackagesAway(Request $request, Pool $pool) |
|
| 394 | - { |
|
| 383 | + private function optimizeImpossiblePackagesAway(Request $request, Pool $pool) { |
|
| 395 | 384 | if (count($request->getLockedPackages()) === 0) { |
| 396 | 385 | return; |
| 397 | 386 | } |
@@ -2,8 +2,7 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace Composer\Filter\PlatformRequirementFilter; |
| 4 | 4 | |
| 5 | -interface PlatformRequirementFilterInterface |
|
| 6 | -{ |
|
| 5 | +interface PlatformRequirementFilterInterface { |
|
| 7 | 6 | /** |
| 8 | 7 | * @param string $req |
| 9 | 8 | * @return bool |
@@ -2,14 +2,12 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace Composer\Filter\PlatformRequirementFilter; |
| 4 | 4 | |
| 5 | -final class IgnoreNothingPlatformRequirementFilter implements PlatformRequirementFilterInterface |
|
| 6 | -{ |
|
| 5 | +final class IgnoreNothingPlatformRequirementFilter implements PlatformRequirementFilterInterface { |
|
| 7 | 6 | /** |
| 8 | 7 | * @param string $req |
| 9 | 8 | * @return false |
| 10 | 9 | */ |
| 11 | - public function isIgnored($req) |
|
| 12 | - { |
|
| 10 | + public function isIgnored($req) { |
|
| 13 | 11 | return false; |
| 14 | 12 | } |
| 15 | 13 | } |
@@ -4,14 +4,12 @@ |
||
| 4 | 4 | |
| 5 | 5 | use Composer\Repository\PlatformRepository; |
| 6 | 6 | |
| 7 | -final class IgnoreAllPlatformRequirementFilter implements PlatformRequirementFilterInterface |
|
| 8 | -{ |
|
| 7 | +final class IgnoreAllPlatformRequirementFilter implements PlatformRequirementFilterInterface { |
|
| 9 | 8 | /** |
| 10 | 9 | * @param string $req |
| 11 | 10 | * @return bool |
| 12 | 11 | */ |
| 13 | - public function isIgnored($req) |
|
| 14 | - { |
|
| 12 | + public function isIgnored($req) { |
|
| 15 | 13 | return PlatformRepository::isPlatformPackage($req); |
| 16 | 14 | } |
| 17 | 15 | } |
@@ -2,15 +2,13 @@ discard block |
||
| 2 | 2 | |
| 3 | 3 | namespace Composer\Filter\PlatformRequirementFilter; |
| 4 | 4 | |
| 5 | -final class PlatformRequirementFilterFactory |
|
| 6 | -{ |
|
| 5 | +final class PlatformRequirementFilterFactory { |
|
| 7 | 6 | /** |
| 8 | 7 | * @param mixed $boolOrList |
| 9 | 8 | * |
| 10 | 9 | * @return PlatformRequirementFilterInterface |
| 11 | 10 | */ |
| 12 | - public static function fromBoolOrList($boolOrList) |
|
| 13 | - { |
|
| 11 | + public static function fromBoolOrList($boolOrList) { |
|
| 14 | 12 | if (is_bool($boolOrList)) { |
| 15 | 13 | return $boolOrList ? self::ignoreAll() : self::ignoreNothing(); |
| 16 | 14 | } |
@@ -30,16 +28,14 @@ discard block |
||
| 30 | 28 | /** |
| 31 | 29 | * @return PlatformRequirementFilterInterface |
| 32 | 30 | */ |
| 33 | - public static function ignoreAll() |
|
| 34 | - { |
|
| 31 | + public static function ignoreAll() { |
|
| 35 | 32 | return new IgnoreAllPlatformRequirementFilter(); |
| 36 | 33 | } |
| 37 | 34 | |
| 38 | 35 | /** |
| 39 | 36 | * @return PlatformRequirementFilterInterface |
| 40 | 37 | */ |
| 41 | - public static function ignoreNothing() |
|
| 42 | - { |
|
| 38 | + public static function ignoreNothing() { |
|
| 43 | 39 | return new IgnoreNothingPlatformRequirementFilter(); |
| 44 | 40 | } |
| 45 | 41 | } |
@@ -12,8 +12,7 @@ discard block |
||
| 12 | 12 | use Composer\Semver\Interval; |
| 13 | 13 | use Composer\Semver\Intervals; |
| 14 | 14 | |
| 15 | -final class IgnoreListPlatformRequirementFilter implements PlatformRequirementFilterInterface |
|
| 16 | -{ |
|
| 15 | +final class IgnoreListPlatformRequirementFilter implements PlatformRequirementFilterInterface { |
|
| 17 | 16 | /** |
| 18 | 17 | * @var string |
| 19 | 18 | */ |
@@ -27,8 +26,7 @@ discard block |
||
| 27 | 26 | /** |
| 28 | 27 | * @param string[] $reqList |
| 29 | 28 | */ |
| 30 | - public function __construct(array $reqList) |
|
| 31 | - { |
|
| 29 | + public function __construct(array $reqList) { |
|
| 32 | 30 | $ignoreAll = $ignoreUpperBound = array(); |
| 33 | 31 | foreach ($reqList as $req) { |
| 34 | 32 | if (substr($req, -1) === '+') { |
@@ -45,8 +43,7 @@ discard block |
||
| 45 | 43 | * @param string $req |
| 46 | 44 | * @return bool |
| 47 | 45 | */ |
| 48 | - public function isIgnored($req) |
|
| 49 | - { |
|
| 46 | + public function isIgnored($req) { |
|
| 50 | 47 | if (!PlatformRepository::isPlatformPackage($req)) { |
| 51 | 48 | return false; |
| 52 | 49 | } |
@@ -58,8 +55,7 @@ discard block |
||
| 58 | 55 | * @param string $req |
| 59 | 56 | * @return ConstraintInterface |
| 60 | 57 | */ |
| 61 | - public function filterConstraint($req, ConstraintInterface $constraint) |
|
| 62 | - { |
|
| 58 | + public function filterConstraint($req, ConstraintInterface $constraint) { |
|
| 63 | 59 | if (!PlatformRepository::isPlatformPackage($req)) { |
| 64 | 60 | return $constraint; |
| 65 | 61 | } |