@@ -7,6 +7,5 @@ |
||
7 | 7 | * |
8 | 8 | * @author Tobias Nyholm <[email protected]> |
9 | 9 | */ |
10 | -final class PuliUnavailableException extends StrategyUnavailableException |
|
11 | -{ |
|
10 | +final class PuliUnavailableException extends StrategyUnavailableException { |
|
12 | 11 | } |
@@ -11,37 +11,37 @@ |
||
11 | 11 | */ |
12 | 12 | final class NoCandidateFoundException extends \Exception implements Exception |
13 | 13 | { |
14 | - /** |
|
15 | - * @param string $strategy |
|
16 | - */ |
|
17 | - public function __construct($strategy, array $candidates) |
|
18 | - { |
|
19 | - $classes = array_map( |
|
20 | - function ($a) { |
|
21 | - return $a['class']; |
|
22 | - }, |
|
23 | - $candidates |
|
24 | - ); |
|
25 | - |
|
26 | - $message = sprintf( |
|
27 | - 'No valid candidate found using strategy "%s". We tested the following candidates: %s.', |
|
28 | - $strategy, |
|
29 | - implode(', ', array_map([$this, 'stringify'], $classes)) |
|
30 | - ); |
|
31 | - |
|
32 | - parent::__construct($message); |
|
33 | - } |
|
34 | - |
|
35 | - private function stringify($mixed) |
|
36 | - { |
|
37 | - if (is_string($mixed)) { |
|
38 | - return $mixed; |
|
39 | - } |
|
40 | - |
|
41 | - if (is_array($mixed) && 2 === count($mixed)) { |
|
42 | - return sprintf('%s::%s', $this->stringify($mixed[0]), $mixed[1]); |
|
43 | - } |
|
44 | - |
|
45 | - return is_object($mixed) ? get_class($mixed) : gettype($mixed); |
|
46 | - } |
|
14 | + /** |
|
15 | + * @param string $strategy |
|
16 | + */ |
|
17 | + public function __construct($strategy, array $candidates) |
|
18 | + { |
|
19 | + $classes = array_map( |
|
20 | + function ($a) { |
|
21 | + return $a['class']; |
|
22 | + }, |
|
23 | + $candidates |
|
24 | + ); |
|
25 | + |
|
26 | + $message = sprintf( |
|
27 | + 'No valid candidate found using strategy "%s". We tested the following candidates: %s.', |
|
28 | + $strategy, |
|
29 | + implode(', ', array_map([$this, 'stringify'], $classes)) |
|
30 | + ); |
|
31 | + |
|
32 | + parent::__construct($message); |
|
33 | + } |
|
34 | + |
|
35 | + private function stringify($mixed) |
|
36 | + { |
|
37 | + if (is_string($mixed)) { |
|
38 | + return $mixed; |
|
39 | + } |
|
40 | + |
|
41 | + if (is_array($mixed) && 2 === count($mixed)) { |
|
42 | + return sprintf('%s::%s', $this->stringify($mixed[0]), $mixed[1]); |
|
43 | + } |
|
44 | + |
|
45 | + return is_object($mixed) ? get_class($mixed) : gettype($mixed); |
|
46 | + } |
|
47 | 47 | } |
@@ -17,7 +17,7 @@ |
||
17 | 17 | public function __construct($strategy, array $candidates) |
18 | 18 | { |
19 | 19 | $classes = array_map( |
20 | - function ($a) { |
|
20 | + function($a) { |
|
21 | 21 | return $a['class']; |
22 | 22 | }, |
23 | 23 | $candidates |
@@ -48,138 +48,138 @@ |
||
48 | 48 | */ |
49 | 49 | final class CommonClassesStrategy implements DiscoveryStrategy |
50 | 50 | { |
51 | - /** |
|
52 | - * @var array |
|
53 | - */ |
|
54 | - private static $classes = [ |
|
55 | - MessageFactory::class => [ |
|
56 | - ['class' => NyholmHttplugFactory::class, 'condition' => [NyholmHttplugFactory::class]], |
|
57 | - ['class' => GuzzleMessageFactory::class, 'condition' => [GuzzleRequest::class, GuzzleMessageFactory::class]], |
|
58 | - ['class' => DiactorosMessageFactory::class, 'condition' => [DiactorosRequest::class, DiactorosMessageFactory::class]], |
|
59 | - ['class' => SlimMessageFactory::class, 'condition' => [SlimRequest::class, SlimMessageFactory::class]], |
|
60 | - ], |
|
61 | - StreamFactory::class => [ |
|
62 | - ['class' => NyholmHttplugFactory::class, 'condition' => [NyholmHttplugFactory::class]], |
|
63 | - ['class' => GuzzleStreamFactory::class, 'condition' => [GuzzleRequest::class, GuzzleStreamFactory::class]], |
|
64 | - ['class' => DiactorosStreamFactory::class, 'condition' => [DiactorosRequest::class, DiactorosStreamFactory::class]], |
|
65 | - ['class' => SlimStreamFactory::class, 'condition' => [SlimRequest::class, SlimStreamFactory::class]], |
|
66 | - ], |
|
67 | - UriFactory::class => [ |
|
68 | - ['class' => NyholmHttplugFactory::class, 'condition' => [NyholmHttplugFactory::class]], |
|
69 | - ['class' => GuzzleUriFactory::class, 'condition' => [GuzzleRequest::class, GuzzleUriFactory::class]], |
|
70 | - ['class' => DiactorosUriFactory::class, 'condition' => [DiactorosRequest::class, DiactorosUriFactory::class]], |
|
71 | - ['class' => SlimUriFactory::class, 'condition' => [SlimRequest::class, SlimUriFactory::class]], |
|
72 | - ], |
|
73 | - HttpAsyncClient::class => [ |
|
74 | - ['class' => SymfonyHttplug::class, 'condition' => [SymfonyHttplug::class, Promise::class, [self::class, 'isPsr17FactoryInstalled']]], |
|
75 | - ['class' => Guzzle7::class, 'condition' => Guzzle7::class], |
|
76 | - ['class' => Guzzle6::class, 'condition' => Guzzle6::class], |
|
77 | - ['class' => Curl::class, 'condition' => Curl::class], |
|
78 | - ['class' => React::class, 'condition' => React::class], |
|
79 | - ], |
|
80 | - HttpClient::class => [ |
|
81 | - ['class' => SymfonyHttplug::class, 'condition' => [SymfonyHttplug::class, [self::class, 'isPsr17FactoryInstalled'], [self::class, 'isSymfonyImplementingHttpClient']]], |
|
82 | - ['class' => Guzzle7::class, 'condition' => Guzzle7::class], |
|
83 | - ['class' => Guzzle6::class, 'condition' => Guzzle6::class], |
|
84 | - ['class' => Guzzle5::class, 'condition' => Guzzle5::class], |
|
85 | - ['class' => Curl::class, 'condition' => Curl::class], |
|
86 | - ['class' => Socket::class, 'condition' => Socket::class], |
|
87 | - ['class' => Buzz::class, 'condition' => Buzz::class], |
|
88 | - ['class' => React::class, 'condition' => React::class], |
|
89 | - ['class' => Cake::class, 'condition' => Cake::class], |
|
90 | - ['class' => Artax::class, 'condition' => Artax::class], |
|
91 | - [ |
|
92 | - 'class' => [self::class, 'buzzInstantiate'], |
|
93 | - 'condition' => [\Buzz\Client\FileGetContents::class, \Buzz\Message\ResponseBuilder::class], |
|
94 | - ], |
|
95 | - ], |
|
96 | - Psr18Client::class => [ |
|
97 | - [ |
|
98 | - 'class' => [self::class, 'symfonyPsr18Instantiate'], |
|
99 | - 'condition' => [SymfonyPsr18::class, Psr17RequestFactory::class], |
|
100 | - ], |
|
101 | - [ |
|
102 | - 'class' => GuzzleHttp::class, |
|
103 | - 'condition' => [self::class, 'isGuzzleImplementingPsr18'], |
|
104 | - ], |
|
105 | - [ |
|
106 | - 'class' => [self::class, 'buzzInstantiate'], |
|
107 | - 'condition' => [\Buzz\Client\FileGetContents::class, \Buzz\Message\ResponseBuilder::class], |
|
108 | - ], |
|
109 | - ], |
|
110 | - ]; |
|
51 | + /** |
|
52 | + * @var array |
|
53 | + */ |
|
54 | + private static $classes = [ |
|
55 | + MessageFactory::class => [ |
|
56 | + ['class' => NyholmHttplugFactory::class, 'condition' => [NyholmHttplugFactory::class]], |
|
57 | + ['class' => GuzzleMessageFactory::class, 'condition' => [GuzzleRequest::class, GuzzleMessageFactory::class]], |
|
58 | + ['class' => DiactorosMessageFactory::class, 'condition' => [DiactorosRequest::class, DiactorosMessageFactory::class]], |
|
59 | + ['class' => SlimMessageFactory::class, 'condition' => [SlimRequest::class, SlimMessageFactory::class]], |
|
60 | + ], |
|
61 | + StreamFactory::class => [ |
|
62 | + ['class' => NyholmHttplugFactory::class, 'condition' => [NyholmHttplugFactory::class]], |
|
63 | + ['class' => GuzzleStreamFactory::class, 'condition' => [GuzzleRequest::class, GuzzleStreamFactory::class]], |
|
64 | + ['class' => DiactorosStreamFactory::class, 'condition' => [DiactorosRequest::class, DiactorosStreamFactory::class]], |
|
65 | + ['class' => SlimStreamFactory::class, 'condition' => [SlimRequest::class, SlimStreamFactory::class]], |
|
66 | + ], |
|
67 | + UriFactory::class => [ |
|
68 | + ['class' => NyholmHttplugFactory::class, 'condition' => [NyholmHttplugFactory::class]], |
|
69 | + ['class' => GuzzleUriFactory::class, 'condition' => [GuzzleRequest::class, GuzzleUriFactory::class]], |
|
70 | + ['class' => DiactorosUriFactory::class, 'condition' => [DiactorosRequest::class, DiactorosUriFactory::class]], |
|
71 | + ['class' => SlimUriFactory::class, 'condition' => [SlimRequest::class, SlimUriFactory::class]], |
|
72 | + ], |
|
73 | + HttpAsyncClient::class => [ |
|
74 | + ['class' => SymfonyHttplug::class, 'condition' => [SymfonyHttplug::class, Promise::class, [self::class, 'isPsr17FactoryInstalled']]], |
|
75 | + ['class' => Guzzle7::class, 'condition' => Guzzle7::class], |
|
76 | + ['class' => Guzzle6::class, 'condition' => Guzzle6::class], |
|
77 | + ['class' => Curl::class, 'condition' => Curl::class], |
|
78 | + ['class' => React::class, 'condition' => React::class], |
|
79 | + ], |
|
80 | + HttpClient::class => [ |
|
81 | + ['class' => SymfonyHttplug::class, 'condition' => [SymfonyHttplug::class, [self::class, 'isPsr17FactoryInstalled'], [self::class, 'isSymfonyImplementingHttpClient']]], |
|
82 | + ['class' => Guzzle7::class, 'condition' => Guzzle7::class], |
|
83 | + ['class' => Guzzle6::class, 'condition' => Guzzle6::class], |
|
84 | + ['class' => Guzzle5::class, 'condition' => Guzzle5::class], |
|
85 | + ['class' => Curl::class, 'condition' => Curl::class], |
|
86 | + ['class' => Socket::class, 'condition' => Socket::class], |
|
87 | + ['class' => Buzz::class, 'condition' => Buzz::class], |
|
88 | + ['class' => React::class, 'condition' => React::class], |
|
89 | + ['class' => Cake::class, 'condition' => Cake::class], |
|
90 | + ['class' => Artax::class, 'condition' => Artax::class], |
|
91 | + [ |
|
92 | + 'class' => [self::class, 'buzzInstantiate'], |
|
93 | + 'condition' => [\Buzz\Client\FileGetContents::class, \Buzz\Message\ResponseBuilder::class], |
|
94 | + ], |
|
95 | + ], |
|
96 | + Psr18Client::class => [ |
|
97 | + [ |
|
98 | + 'class' => [self::class, 'symfonyPsr18Instantiate'], |
|
99 | + 'condition' => [SymfonyPsr18::class, Psr17RequestFactory::class], |
|
100 | + ], |
|
101 | + [ |
|
102 | + 'class' => GuzzleHttp::class, |
|
103 | + 'condition' => [self::class, 'isGuzzleImplementingPsr18'], |
|
104 | + ], |
|
105 | + [ |
|
106 | + 'class' => [self::class, 'buzzInstantiate'], |
|
107 | + 'condition' => [\Buzz\Client\FileGetContents::class, \Buzz\Message\ResponseBuilder::class], |
|
108 | + ], |
|
109 | + ], |
|
110 | + ]; |
|
111 | 111 | |
112 | - public static function getCandidates($type) |
|
113 | - { |
|
114 | - if (Psr18Client::class === $type) { |
|
115 | - return self::getPsr18Candidates(); |
|
116 | - } |
|
112 | + public static function getCandidates($type) |
|
113 | + { |
|
114 | + if (Psr18Client::class === $type) { |
|
115 | + return self::getPsr18Candidates(); |
|
116 | + } |
|
117 | 117 | |
118 | - return self::$classes[$type] ?? []; |
|
119 | - } |
|
118 | + return self::$classes[$type] ?? []; |
|
119 | + } |
|
120 | 120 | |
121 | - /** |
|
122 | - * @return array The return value is always an array with zero or more elements. Each |
|
123 | - * element is an array with two keys ['class' => string, 'condition' => mixed]. |
|
124 | - */ |
|
125 | - private static function getPsr18Candidates() |
|
126 | - { |
|
127 | - $candidates = self::$classes[Psr18Client::class]; |
|
121 | + /** |
|
122 | + * @return array The return value is always an array with zero or more elements. Each |
|
123 | + * element is an array with two keys ['class' => string, 'condition' => mixed]. |
|
124 | + */ |
|
125 | + private static function getPsr18Candidates() |
|
126 | + { |
|
127 | + $candidates = self::$classes[Psr18Client::class]; |
|
128 | 128 | |
129 | - // HTTPlug 2.0 clients implements PSR18Client too. |
|
130 | - foreach (self::$classes[HttpClient::class] as $c) { |
|
131 | - if (!is_string($c['class'])) { |
|
132 | - continue; |
|
133 | - } |
|
134 | - try { |
|
135 | - if (ClassDiscovery::safeClassExists($c['class']) && is_subclass_of($c['class'], Psr18Client::class)) { |
|
136 | - $candidates[] = $c; |
|
137 | - } |
|
138 | - } catch (\Throwable $e) { |
|
139 | - trigger_error(sprintf('Got exception "%s (%s)" while checking if a PSR-18 Client is available', get_class($e), $e->getMessage()), E_USER_WARNING); |
|
140 | - } |
|
141 | - } |
|
129 | + // HTTPlug 2.0 clients implements PSR18Client too. |
|
130 | + foreach (self::$classes[HttpClient::class] as $c) { |
|
131 | + if (!is_string($c['class'])) { |
|
132 | + continue; |
|
133 | + } |
|
134 | + try { |
|
135 | + if (ClassDiscovery::safeClassExists($c['class']) && is_subclass_of($c['class'], Psr18Client::class)) { |
|
136 | + $candidates[] = $c; |
|
137 | + } |
|
138 | + } catch (\Throwable $e) { |
|
139 | + trigger_error(sprintf('Got exception "%s (%s)" while checking if a PSR-18 Client is available', get_class($e), $e->getMessage()), E_USER_WARNING); |
|
140 | + } |
|
141 | + } |
|
142 | 142 | |
143 | - return $candidates; |
|
144 | - } |
|
143 | + return $candidates; |
|
144 | + } |
|
145 | 145 | |
146 | - public static function buzzInstantiate() |
|
147 | - { |
|
148 | - return new \Buzz\Client\FileGetContents(Psr17FactoryDiscovery::findResponseFactory()); |
|
149 | - } |
|
146 | + public static function buzzInstantiate() |
|
147 | + { |
|
148 | + return new \Buzz\Client\FileGetContents(Psr17FactoryDiscovery::findResponseFactory()); |
|
149 | + } |
|
150 | 150 | |
151 | - public static function symfonyPsr18Instantiate() |
|
152 | - { |
|
153 | - return new SymfonyPsr18(null, Psr17FactoryDiscovery::findResponseFactory(), Psr17FactoryDiscovery::findStreamFactory()); |
|
154 | - } |
|
151 | + public static function symfonyPsr18Instantiate() |
|
152 | + { |
|
153 | + return new SymfonyPsr18(null, Psr17FactoryDiscovery::findResponseFactory(), Psr17FactoryDiscovery::findStreamFactory()); |
|
154 | + } |
|
155 | 155 | |
156 | - public static function isGuzzleImplementingPsr18() |
|
157 | - { |
|
158 | - return defined('GuzzleHttp\ClientInterface::MAJOR_VERSION'); |
|
159 | - } |
|
156 | + public static function isGuzzleImplementingPsr18() |
|
157 | + { |
|
158 | + return defined('GuzzleHttp\ClientInterface::MAJOR_VERSION'); |
|
159 | + } |
|
160 | 160 | |
161 | - public static function isSymfonyImplementingHttpClient() |
|
162 | - { |
|
163 | - return is_subclass_of(SymfonyHttplug::class, HttpClient::class); |
|
164 | - } |
|
161 | + public static function isSymfonyImplementingHttpClient() |
|
162 | + { |
|
163 | + return is_subclass_of(SymfonyHttplug::class, HttpClient::class); |
|
164 | + } |
|
165 | 165 | |
166 | - /** |
|
167 | - * Can be used as a condition. |
|
168 | - * |
|
169 | - * @return bool |
|
170 | - */ |
|
171 | - public static function isPsr17FactoryInstalled() |
|
172 | - { |
|
173 | - try { |
|
174 | - Psr17FactoryDiscovery::findResponseFactory(); |
|
175 | - } catch (NotFoundException $e) { |
|
176 | - return false; |
|
177 | - } catch (\Throwable $e) { |
|
178 | - trigger_error(sprintf('Got exception "%s (%s)" while checking if a PSR-17 ResponseFactory is available', get_class($e), $e->getMessage()), E_USER_WARNING); |
|
166 | + /** |
|
167 | + * Can be used as a condition. |
|
168 | + * |
|
169 | + * @return bool |
|
170 | + */ |
|
171 | + public static function isPsr17FactoryInstalled() |
|
172 | + { |
|
173 | + try { |
|
174 | + Psr17FactoryDiscovery::findResponseFactory(); |
|
175 | + } catch (NotFoundException $e) { |
|
176 | + return false; |
|
177 | + } catch (\Throwable $e) { |
|
178 | + trigger_error(sprintf('Got exception "%s (%s)" while checking if a PSR-17 ResponseFactory is available', get_class($e), $e->getMessage()), E_USER_WARNING); |
|
179 | 179 | |
180 | - return false; |
|
181 | - } |
|
180 | + return false; |
|
181 | + } |
|
182 | 182 | |
183 | - return true; |
|
184 | - } |
|
183 | + return true; |
|
184 | + } |
|
185 | 185 | } |
@@ -46,8 +46,7 @@ |
||
46 | 46 | * |
47 | 47 | * Don't miss updating src/Composer/Plugin.php when adding a new supported class. |
48 | 48 | */ |
49 | -final class CommonClassesStrategy implements DiscoveryStrategy |
|
50 | -{ |
|
49 | +final class CommonClassesStrategy implements DiscoveryStrategy { |
|
51 | 50 | /** |
52 | 51 | * @var array |
53 | 52 | */ |
@@ -19,72 +19,72 @@ |
||
19 | 19 | */ |
20 | 20 | class PuliBetaStrategy implements DiscoveryStrategy |
21 | 21 | { |
22 | - /** |
|
23 | - * @var GeneratedPuliFactory |
|
24 | - */ |
|
25 | - protected static $puliFactory; |
|
22 | + /** |
|
23 | + * @var GeneratedPuliFactory |
|
24 | + */ |
|
25 | + protected static $puliFactory; |
|
26 | 26 | |
27 | - /** |
|
28 | - * @var Discovery |
|
29 | - */ |
|
30 | - protected static $puliDiscovery; |
|
27 | + /** |
|
28 | + * @var Discovery |
|
29 | + */ |
|
30 | + protected static $puliDiscovery; |
|
31 | 31 | |
32 | - /** |
|
33 | - * @return GeneratedPuliFactory |
|
34 | - * |
|
35 | - * @throws PuliUnavailableException |
|
36 | - */ |
|
37 | - private static function getPuliFactory() |
|
38 | - { |
|
39 | - if (null === self::$puliFactory) { |
|
40 | - if (!defined('PULI_FACTORY_CLASS')) { |
|
41 | - throw new PuliUnavailableException('Puli Factory is not available'); |
|
42 | - } |
|
32 | + /** |
|
33 | + * @return GeneratedPuliFactory |
|
34 | + * |
|
35 | + * @throws PuliUnavailableException |
|
36 | + */ |
|
37 | + private static function getPuliFactory() |
|
38 | + { |
|
39 | + if (null === self::$puliFactory) { |
|
40 | + if (!defined('PULI_FACTORY_CLASS')) { |
|
41 | + throw new PuliUnavailableException('Puli Factory is not available'); |
|
42 | + } |
|
43 | 43 | |
44 | - $puliFactoryClass = PULI_FACTORY_CLASS; |
|
44 | + $puliFactoryClass = PULI_FACTORY_CLASS; |
|
45 | 45 | |
46 | - if (!ClassDiscovery::safeClassExists($puliFactoryClass)) { |
|
47 | - throw new PuliUnavailableException('Puli Factory class does not exist'); |
|
48 | - } |
|
46 | + if (!ClassDiscovery::safeClassExists($puliFactoryClass)) { |
|
47 | + throw new PuliUnavailableException('Puli Factory class does not exist'); |
|
48 | + } |
|
49 | 49 | |
50 | - self::$puliFactory = new $puliFactoryClass(); |
|
51 | - } |
|
50 | + self::$puliFactory = new $puliFactoryClass(); |
|
51 | + } |
|
52 | 52 | |
53 | - return self::$puliFactory; |
|
54 | - } |
|
53 | + return self::$puliFactory; |
|
54 | + } |
|
55 | 55 | |
56 | - /** |
|
57 | - * Returns the Puli discovery layer. |
|
58 | - * |
|
59 | - * @return Discovery |
|
60 | - * |
|
61 | - * @throws PuliUnavailableException |
|
62 | - */ |
|
63 | - private static function getPuliDiscovery() |
|
64 | - { |
|
65 | - if (!isset(self::$puliDiscovery)) { |
|
66 | - $factory = self::getPuliFactory(); |
|
67 | - $repository = $factory->createRepository(); |
|
56 | + /** |
|
57 | + * Returns the Puli discovery layer. |
|
58 | + * |
|
59 | + * @return Discovery |
|
60 | + * |
|
61 | + * @throws PuliUnavailableException |
|
62 | + */ |
|
63 | + private static function getPuliDiscovery() |
|
64 | + { |
|
65 | + if (!isset(self::$puliDiscovery)) { |
|
66 | + $factory = self::getPuliFactory(); |
|
67 | + $repository = $factory->createRepository(); |
|
68 | 68 | |
69 | - self::$puliDiscovery = $factory->createDiscovery($repository); |
|
70 | - } |
|
69 | + self::$puliDiscovery = $factory->createDiscovery($repository); |
|
70 | + } |
|
71 | 71 | |
72 | - return self::$puliDiscovery; |
|
73 | - } |
|
72 | + return self::$puliDiscovery; |
|
73 | + } |
|
74 | 74 | |
75 | - public static function getCandidates($type) |
|
76 | - { |
|
77 | - $returnData = []; |
|
78 | - $bindings = self::getPuliDiscovery()->findBindings($type); |
|
75 | + public static function getCandidates($type) |
|
76 | + { |
|
77 | + $returnData = []; |
|
78 | + $bindings = self::getPuliDiscovery()->findBindings($type); |
|
79 | 79 | |
80 | - foreach ($bindings as $binding) { |
|
81 | - $condition = true; |
|
82 | - if ($binding->hasParameterValue('depends')) { |
|
83 | - $condition = $binding->getParameterValue('depends'); |
|
84 | - } |
|
85 | - $returnData[] = ['class' => $binding->getClassName(), 'condition' => $condition]; |
|
86 | - } |
|
80 | + foreach ($bindings as $binding) { |
|
81 | + $condition = true; |
|
82 | + if ($binding->hasParameterValue('depends')) { |
|
83 | + $condition = $binding->getParameterValue('depends'); |
|
84 | + } |
|
85 | + $returnData[] = ['class' => $binding->getClassName(), 'condition' => $condition]; |
|
86 | + } |
|
87 | 87 | |
88 | - return $returnData; |
|
89 | - } |
|
88 | + return $returnData; |
|
89 | + } |
|
90 | 90 | } |
@@ -17,8 +17,7 @@ |
||
17 | 17 | * @author David de Boer <[email protected]> |
18 | 18 | * @author Márk Sági-Kazár <[email protected]> |
19 | 19 | */ |
20 | -class PuliBetaStrategy implements DiscoveryStrategy |
|
21 | -{ |
|
20 | +class PuliBetaStrategy implements DiscoveryStrategy { |
|
22 | 21 | /** |
23 | 22 | * @var GeneratedPuliFactory |
24 | 23 | */ |
@@ -9,15 +9,15 @@ |
||
9 | 9 | */ |
10 | 10 | interface DiscoveryStrategy |
11 | 11 | { |
12 | - /** |
|
13 | - * Find a resource of a specific type. |
|
14 | - * |
|
15 | - * @param string $type |
|
16 | - * |
|
17 | - * @return array The return value is always an array with zero or more elements. Each |
|
18 | - * element is an array with two keys ['class' => string, 'condition' => mixed]. |
|
19 | - * |
|
20 | - * @throws StrategyUnavailableException if we cannot use this strategy |
|
21 | - */ |
|
22 | - public static function getCandidates($type); |
|
12 | + /** |
|
13 | + * Find a resource of a specific type. |
|
14 | + * |
|
15 | + * @param string $type |
|
16 | + * |
|
17 | + * @return array The return value is always an array with zero or more elements. Each |
|
18 | + * element is an array with two keys ['class' => string, 'condition' => mixed]. |
|
19 | + * |
|
20 | + * @throws StrategyUnavailableException if we cannot use this strategy |
|
21 | + */ |
|
22 | + public static function getCandidates($type); |
|
23 | 23 | } |
@@ -7,8 +7,7 @@ |
||
7 | 7 | /** |
8 | 8 | * @author Tobias Nyholm <[email protected]> |
9 | 9 | */ |
10 | -interface DiscoveryStrategy |
|
11 | -{ |
|
10 | +interface DiscoveryStrategy { |
|
12 | 11 | /** |
13 | 12 | * Find a resource of a specific type. |
14 | 13 | * |
@@ -18,87 +18,87 @@ |
||
18 | 18 | */ |
19 | 19 | final class CommonPsr17ClassesStrategy implements DiscoveryStrategy |
20 | 20 | { |
21 | - /** |
|
22 | - * @var array |
|
23 | - */ |
|
24 | - private static $classes = [ |
|
25 | - RequestFactoryInterface::class => [ |
|
26 | - 'Phalcon\Http\Message\RequestFactory', |
|
27 | - 'Nyholm\Psr7\Factory\Psr17Factory', |
|
28 | - 'GuzzleHttp\Psr7\HttpFactory', |
|
29 | - 'Http\Factory\Diactoros\RequestFactory', |
|
30 | - 'Http\Factory\Guzzle\RequestFactory', |
|
31 | - 'Http\Factory\Slim\RequestFactory', |
|
32 | - 'Laminas\Diactoros\RequestFactory', |
|
33 | - 'Slim\Psr7\Factory\RequestFactory', |
|
34 | - 'HttpSoft\Message\RequestFactory', |
|
35 | - ], |
|
36 | - ResponseFactoryInterface::class => [ |
|
37 | - 'Phalcon\Http\Message\ResponseFactory', |
|
38 | - 'Nyholm\Psr7\Factory\Psr17Factory', |
|
39 | - 'GuzzleHttp\Psr7\HttpFactory', |
|
40 | - 'Http\Factory\Diactoros\ResponseFactory', |
|
41 | - 'Http\Factory\Guzzle\ResponseFactory', |
|
42 | - 'Http\Factory\Slim\ResponseFactory', |
|
43 | - 'Laminas\Diactoros\ResponseFactory', |
|
44 | - 'Slim\Psr7\Factory\ResponseFactory', |
|
45 | - 'HttpSoft\Message\ResponseFactory', |
|
46 | - ], |
|
47 | - ServerRequestFactoryInterface::class => [ |
|
48 | - 'Phalcon\Http\Message\ServerRequestFactory', |
|
49 | - 'Nyholm\Psr7\Factory\Psr17Factory', |
|
50 | - 'GuzzleHttp\Psr7\HttpFactory', |
|
51 | - 'Http\Factory\Diactoros\ServerRequestFactory', |
|
52 | - 'Http\Factory\Guzzle\ServerRequestFactory', |
|
53 | - 'Http\Factory\Slim\ServerRequestFactory', |
|
54 | - 'Laminas\Diactoros\ServerRequestFactory', |
|
55 | - 'Slim\Psr7\Factory\ServerRequestFactory', |
|
56 | - 'HttpSoft\Message\ServerRequestFactory', |
|
57 | - ], |
|
58 | - StreamFactoryInterface::class => [ |
|
59 | - 'Phalcon\Http\Message\StreamFactory', |
|
60 | - 'Nyholm\Psr7\Factory\Psr17Factory', |
|
61 | - 'GuzzleHttp\Psr7\HttpFactory', |
|
62 | - 'Http\Factory\Diactoros\StreamFactory', |
|
63 | - 'Http\Factory\Guzzle\StreamFactory', |
|
64 | - 'Http\Factory\Slim\StreamFactory', |
|
65 | - 'Laminas\Diactoros\StreamFactory', |
|
66 | - 'Slim\Psr7\Factory\StreamFactory', |
|
67 | - 'HttpSoft\Message\StreamFactory', |
|
68 | - ], |
|
69 | - UploadedFileFactoryInterface::class => [ |
|
70 | - 'Phalcon\Http\Message\UploadedFileFactory', |
|
71 | - 'Nyholm\Psr7\Factory\Psr17Factory', |
|
72 | - 'GuzzleHttp\Psr7\HttpFactory', |
|
73 | - 'Http\Factory\Diactoros\UploadedFileFactory', |
|
74 | - 'Http\Factory\Guzzle\UploadedFileFactory', |
|
75 | - 'Http\Factory\Slim\UploadedFileFactory', |
|
76 | - 'Laminas\Diactoros\UploadedFileFactory', |
|
77 | - 'Slim\Psr7\Factory\UploadedFileFactory', |
|
78 | - 'HttpSoft\Message\UploadedFileFactory', |
|
79 | - ], |
|
80 | - UriFactoryInterface::class => [ |
|
81 | - 'Phalcon\Http\Message\UriFactory', |
|
82 | - 'Nyholm\Psr7\Factory\Psr17Factory', |
|
83 | - 'GuzzleHttp\Psr7\HttpFactory', |
|
84 | - 'Http\Factory\Diactoros\UriFactory', |
|
85 | - 'Http\Factory\Guzzle\UriFactory', |
|
86 | - 'Http\Factory\Slim\UriFactory', |
|
87 | - 'Laminas\Diactoros\UriFactory', |
|
88 | - 'Slim\Psr7\Factory\UriFactory', |
|
89 | - 'HttpSoft\Message\UriFactory', |
|
90 | - ], |
|
91 | - ]; |
|
21 | + /** |
|
22 | + * @var array |
|
23 | + */ |
|
24 | + private static $classes = [ |
|
25 | + RequestFactoryInterface::class => [ |
|
26 | + 'Phalcon\Http\Message\RequestFactory', |
|
27 | + 'Nyholm\Psr7\Factory\Psr17Factory', |
|
28 | + 'GuzzleHttp\Psr7\HttpFactory', |
|
29 | + 'Http\Factory\Diactoros\RequestFactory', |
|
30 | + 'Http\Factory\Guzzle\RequestFactory', |
|
31 | + 'Http\Factory\Slim\RequestFactory', |
|
32 | + 'Laminas\Diactoros\RequestFactory', |
|
33 | + 'Slim\Psr7\Factory\RequestFactory', |
|
34 | + 'HttpSoft\Message\RequestFactory', |
|
35 | + ], |
|
36 | + ResponseFactoryInterface::class => [ |
|
37 | + 'Phalcon\Http\Message\ResponseFactory', |
|
38 | + 'Nyholm\Psr7\Factory\Psr17Factory', |
|
39 | + 'GuzzleHttp\Psr7\HttpFactory', |
|
40 | + 'Http\Factory\Diactoros\ResponseFactory', |
|
41 | + 'Http\Factory\Guzzle\ResponseFactory', |
|
42 | + 'Http\Factory\Slim\ResponseFactory', |
|
43 | + 'Laminas\Diactoros\ResponseFactory', |
|
44 | + 'Slim\Psr7\Factory\ResponseFactory', |
|
45 | + 'HttpSoft\Message\ResponseFactory', |
|
46 | + ], |
|
47 | + ServerRequestFactoryInterface::class => [ |
|
48 | + 'Phalcon\Http\Message\ServerRequestFactory', |
|
49 | + 'Nyholm\Psr7\Factory\Psr17Factory', |
|
50 | + 'GuzzleHttp\Psr7\HttpFactory', |
|
51 | + 'Http\Factory\Diactoros\ServerRequestFactory', |
|
52 | + 'Http\Factory\Guzzle\ServerRequestFactory', |
|
53 | + 'Http\Factory\Slim\ServerRequestFactory', |
|
54 | + 'Laminas\Diactoros\ServerRequestFactory', |
|
55 | + 'Slim\Psr7\Factory\ServerRequestFactory', |
|
56 | + 'HttpSoft\Message\ServerRequestFactory', |
|
57 | + ], |
|
58 | + StreamFactoryInterface::class => [ |
|
59 | + 'Phalcon\Http\Message\StreamFactory', |
|
60 | + 'Nyholm\Psr7\Factory\Psr17Factory', |
|
61 | + 'GuzzleHttp\Psr7\HttpFactory', |
|
62 | + 'Http\Factory\Diactoros\StreamFactory', |
|
63 | + 'Http\Factory\Guzzle\StreamFactory', |
|
64 | + 'Http\Factory\Slim\StreamFactory', |
|
65 | + 'Laminas\Diactoros\StreamFactory', |
|
66 | + 'Slim\Psr7\Factory\StreamFactory', |
|
67 | + 'HttpSoft\Message\StreamFactory', |
|
68 | + ], |
|
69 | + UploadedFileFactoryInterface::class => [ |
|
70 | + 'Phalcon\Http\Message\UploadedFileFactory', |
|
71 | + 'Nyholm\Psr7\Factory\Psr17Factory', |
|
72 | + 'GuzzleHttp\Psr7\HttpFactory', |
|
73 | + 'Http\Factory\Diactoros\UploadedFileFactory', |
|
74 | + 'Http\Factory\Guzzle\UploadedFileFactory', |
|
75 | + 'Http\Factory\Slim\UploadedFileFactory', |
|
76 | + 'Laminas\Diactoros\UploadedFileFactory', |
|
77 | + 'Slim\Psr7\Factory\UploadedFileFactory', |
|
78 | + 'HttpSoft\Message\UploadedFileFactory', |
|
79 | + ], |
|
80 | + UriFactoryInterface::class => [ |
|
81 | + 'Phalcon\Http\Message\UriFactory', |
|
82 | + 'Nyholm\Psr7\Factory\Psr17Factory', |
|
83 | + 'GuzzleHttp\Psr7\HttpFactory', |
|
84 | + 'Http\Factory\Diactoros\UriFactory', |
|
85 | + 'Http\Factory\Guzzle\UriFactory', |
|
86 | + 'Http\Factory\Slim\UriFactory', |
|
87 | + 'Laminas\Diactoros\UriFactory', |
|
88 | + 'Slim\Psr7\Factory\UriFactory', |
|
89 | + 'HttpSoft\Message\UriFactory', |
|
90 | + ], |
|
91 | + ]; |
|
92 | 92 | |
93 | - public static function getCandidates($type) |
|
94 | - { |
|
95 | - $candidates = []; |
|
96 | - if (isset(self::$classes[$type])) { |
|
97 | - foreach (self::$classes[$type] as $class) { |
|
98 | - $candidates[] = ['class' => $class, 'condition' => [$class]]; |
|
99 | - } |
|
100 | - } |
|
93 | + public static function getCandidates($type) |
|
94 | + { |
|
95 | + $candidates = []; |
|
96 | + if (isset(self::$classes[$type])) { |
|
97 | + foreach (self::$classes[$type] as $class) { |
|
98 | + $candidates[] = ['class' => $class, 'condition' => [$class]]; |
|
99 | + } |
|
100 | + } |
|
101 | 101 | |
102 | - return $candidates; |
|
103 | - } |
|
102 | + return $candidates; |
|
103 | + } |
|
104 | 104 | } |
@@ -16,8 +16,7 @@ |
||
16 | 16 | * |
17 | 17 | * Don't miss updating src/Composer/Plugin.php when adding a new supported class. |
18 | 18 | */ |
19 | -final class CommonPsr17ClassesStrategy implements DiscoveryStrategy |
|
20 | -{ |
|
19 | +final class CommonPsr17ClassesStrategy implements DiscoveryStrategy { |
|
21 | 20 | /** |
22 | 21 | * @var array |
23 | 22 | */ |
@@ -13,12 +13,12 @@ |
||
13 | 13 | */ |
14 | 14 | final class MockClientStrategy implements DiscoveryStrategy |
15 | 15 | { |
16 | - public static function getCandidates($type) |
|
17 | - { |
|
18 | - if (is_a(HttpClient::class, $type, true) || is_a(HttpAsyncClient::class, $type, true)) { |
|
19 | - return [['class' => Mock::class, 'condition' => Mock::class]]; |
|
20 | - } |
|
16 | + public static function getCandidates($type) |
|
17 | + { |
|
18 | + if (is_a(HttpClient::class, $type, true) || is_a(HttpAsyncClient::class, $type, true)) { |
|
19 | + return [['class' => Mock::class, 'condition' => Mock::class]]; |
|
20 | + } |
|
21 | 21 | |
22 | - return []; |
|
23 | - } |
|
22 | + return []; |
|
23 | + } |
|
24 | 24 | } |
@@ -11,8 +11,7 @@ |
||
11 | 11 | * |
12 | 12 | * @author Sam Rapaport <[email protected]> |
13 | 13 | */ |
14 | -final class MockClientStrategy implements DiscoveryStrategy |
|
15 | -{ |
|
14 | +final class MockClientStrategy implements DiscoveryStrategy { |
|
16 | 15 | public static function getCandidates($type) |
17 | 16 | { |
18 | 17 | if (is_a(HttpClient::class, $type, true) || is_a(HttpAsyncClient::class, $type, true)) { |
@@ -14,21 +14,21 @@ |
||
14 | 14 | */ |
15 | 15 | final class StreamFactoryDiscovery extends ClassDiscovery |
16 | 16 | { |
17 | - /** |
|
18 | - * Finds a Stream Factory. |
|
19 | - * |
|
20 | - * @return StreamFactory |
|
21 | - * |
|
22 | - * @throws Exception\NotFoundException |
|
23 | - */ |
|
24 | - public static function find() |
|
25 | - { |
|
26 | - try { |
|
27 | - $streamFactory = static::findOneByType(StreamFactory::class); |
|
28 | - } catch (DiscoveryFailedException $e) { |
|
29 | - throw new NotFoundException('No stream factories found. To use Guzzle, Diactoros or Slim Framework factories install php-http/message and the chosen message implementation.', 0, $e); |
|
30 | - } |
|
17 | + /** |
|
18 | + * Finds a Stream Factory. |
|
19 | + * |
|
20 | + * @return StreamFactory |
|
21 | + * |
|
22 | + * @throws Exception\NotFoundException |
|
23 | + */ |
|
24 | + public static function find() |
|
25 | + { |
|
26 | + try { |
|
27 | + $streamFactory = static::findOneByType(StreamFactory::class); |
|
28 | + } catch (DiscoveryFailedException $e) { |
|
29 | + throw new NotFoundException('No stream factories found. To use Guzzle, Diactoros or Slim Framework factories install php-http/message and the chosen message implementation.', 0, $e); |
|
30 | + } |
|
31 | 31 | |
32 | - return static::instantiateClass($streamFactory); |
|
33 | - } |
|
32 | + return static::instantiateClass($streamFactory); |
|
33 | + } |
|
34 | 34 | } |
@@ -12,8 +12,7 @@ |
||
12 | 12 | * |
13 | 13 | * @deprecated This will be removed in 2.0. Consider using Psr17FactoryDiscovery. |
14 | 14 | */ |
15 | -final class StreamFactoryDiscovery extends ClassDiscovery |
|
16 | -{ |
|
15 | +final class StreamFactoryDiscovery extends ClassDiscovery { |
|
17 | 16 | /** |
18 | 17 | * Finds a Stream Factory. |
19 | 18 | * |
@@ -22,24 +22,24 @@ |
||
22 | 22 | */ |
23 | 23 | class Psr18Client extends Psr17Factory implements ClientInterface |
24 | 24 | { |
25 | - private $client; |
|
25 | + private $client; |
|
26 | 26 | |
27 | - public function __construct( |
|
28 | - ?ClientInterface $client = null, |
|
29 | - ?RequestFactoryInterface $requestFactory = null, |
|
30 | - ?ResponseFactoryInterface $responseFactory = null, |
|
31 | - ?ServerRequestFactoryInterface $serverRequestFactory = null, |
|
32 | - ?StreamFactoryInterface $streamFactory = null, |
|
33 | - ?UploadedFileFactoryInterface $uploadedFileFactory = null, |
|
34 | - ?UriFactoryInterface $uriFactory = null |
|
35 | - ) { |
|
36 | - parent::__construct($requestFactory, $responseFactory, $serverRequestFactory, $streamFactory, $uploadedFileFactory, $uriFactory); |
|
27 | + public function __construct( |
|
28 | + ?ClientInterface $client = null, |
|
29 | + ?RequestFactoryInterface $requestFactory = null, |
|
30 | + ?ResponseFactoryInterface $responseFactory = null, |
|
31 | + ?ServerRequestFactoryInterface $serverRequestFactory = null, |
|
32 | + ?StreamFactoryInterface $streamFactory = null, |
|
33 | + ?UploadedFileFactoryInterface $uploadedFileFactory = null, |
|
34 | + ?UriFactoryInterface $uriFactory = null |
|
35 | + ) { |
|
36 | + parent::__construct($requestFactory, $responseFactory, $serverRequestFactory, $streamFactory, $uploadedFileFactory, $uriFactory); |
|
37 | 37 | |
38 | - $this->client = $client ?? Psr18ClientDiscovery::find(); |
|
39 | - } |
|
38 | + $this->client = $client ?? Psr18ClientDiscovery::find(); |
|
39 | + } |
|
40 | 40 | |
41 | - public function sendRequest(RequestInterface $request): ResponseInterface |
|
42 | - { |
|
43 | - return $this->client->sendRequest($request); |
|
44 | - } |
|
41 | + public function sendRequest(RequestInterface $request): ResponseInterface |
|
42 | + { |
|
43 | + return $this->client->sendRequest($request); |
|
44 | + } |
|
45 | 45 | } |
@@ -20,8 +20,7 @@ |
||
20 | 20 | * |
21 | 21 | * @author Nicolas Grekas <[email protected]> |
22 | 22 | */ |
23 | -class Psr18Client extends Psr17Factory implements ClientInterface |
|
24 | -{ |
|
23 | +class Psr18Client extends Psr17Factory implements ClientInterface { |
|
25 | 24 | private $client; |
26 | 25 | |
27 | 26 | public function __construct( |