Skip to content

Commit

Permalink
Replace @return annotation by return type in final classes
Browse files Browse the repository at this point in the history
  • Loading branch information
dFayet committed Jun 22, 2019
1 parent 6b163d7 commit 1dd13ed
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 27 deletions.
2 changes: 1 addition & 1 deletion CompiledRoute.php
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ public function __serialize(): array
/**
* @internal
*/
final public function serialize()
final public function serialize(): string
{
return serialize($this->__serialize());
}
Expand Down
6 changes: 2 additions & 4 deletions Loader/Configurator/CollectionConfigurator.php
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,8 @@ public function __destruct()

/**
* Creates a sub-collection.
*
* @return self
*/
final public function collection($name = '')
final public function collection($name = ''): self
{
return new self($this->collection, $this->name.$name, $this, $this->prefixes);
}
Expand All @@ -62,7 +60,7 @@ final public function collection($name = '')
*
* @return $this
*/
final public function prefix($prefix)
final public function prefix($prefix): object
{
if (\is_array($prefix)) {
if (null === $this->parentPrefixes) {
Expand Down
4 changes: 2 additions & 2 deletions Loader/Configurator/ImportConfigurator.php
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public function __destruct()
*
* @return $this
*/
final public function prefix($prefix, bool $trailingSlashOnRoot = true)
final public function prefix($prefix, bool $trailingSlashOnRoot = true): object
{
if (!\is_array($prefix)) {
$this->route->addPrefix($prefix);
Expand Down Expand Up @@ -84,7 +84,7 @@ final public function prefix($prefix, bool $trailingSlashOnRoot = true)
*
* @return $this
*/
final public function namePrefix(string $namePrefix)
final public function namePrefix(string $namePrefix): object
{
$this->route->addNamePrefix($namePrefix);

Expand Down
10 changes: 2 additions & 8 deletions Loader/Configurator/RoutingConfigurator.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,7 @@ public function __construct(RouteCollection $collection, PhpFileLoader $loader,
$this->file = $file;
}

/**
* @return ImportConfigurator
*/
final public function import($resource, $type = null, $ignoreErrors = false)
final public function import($resource, $type = null, $ignoreErrors = false): ImportConfigurator
{
$this->loader->setCurrentDir(\dirname($this->path));
$imported = $this->loader->import($resource, $type, $ignoreErrors, $this->file);
Expand All @@ -52,10 +49,7 @@ final public function import($resource, $type = null, $ignoreErrors = false)
return new ImportConfigurator($this->collection, $mergedCollection);
}

/**
* @return CollectionConfigurator
*/
final public function collection($name = '')
final public function collection($name = ''): CollectionConfigurator
{
return new CollectionConfigurator($this->collection, $name);
}
Expand Down
22 changes: 11 additions & 11 deletions Loader/Configurator/Traits/RouteTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ trait RouteTrait
*
* @return $this
*/
final public function defaults(array $defaults)
final public function defaults(array $defaults): object
{
$this->route->addDefaults($defaults);

Expand All @@ -38,7 +38,7 @@ final public function defaults(array $defaults)
*
* @return $this
*/
final public function requirements(array $requirements)
final public function requirements(array $requirements): object
{
$this->route->addRequirements($requirements);

Expand All @@ -50,7 +50,7 @@ final public function requirements(array $requirements)
*
* @return $this
*/
final public function options(array $options)
final public function options(array $options): object
{
$this->route->addOptions($options);

Expand All @@ -62,7 +62,7 @@ final public function options(array $options)
*
* @return $this
*/
final public function utf8(bool $utf8 = true)
final public function utf8(bool $utf8 = true): object
{
$this->route->addOptions(['utf8' => $utf8]);

Expand All @@ -74,7 +74,7 @@ final public function utf8(bool $utf8 = true)
*
* @return $this
*/
final public function condition(string $condition)
final public function condition(string $condition): object
{
$this->route->setCondition($condition);

Expand All @@ -86,7 +86,7 @@ final public function condition(string $condition)
*
* @return $this
*/
final public function host(string $pattern)
final public function host(string $pattern): object
{
$this->route->setHost($pattern);

Expand All @@ -101,7 +101,7 @@ final public function host(string $pattern)
*
* @return $this
*/
final public function schemes(array $schemes)
final public function schemes(array $schemes): object
{
$this->route->setSchemes($schemes);

Expand All @@ -116,7 +116,7 @@ final public function schemes(array $schemes)
*
* @return $this
*/
final public function methods(array $methods)
final public function methods(array $methods): object
{
$this->route->setMethods($methods);

Expand All @@ -130,7 +130,7 @@ final public function methods(array $methods)
*
* @return $this
*/
final public function controller($controller)
final public function controller($controller): object
{
$this->route->addDefaults(['_controller' => $controller]);

Expand All @@ -142,7 +142,7 @@ final public function controller($controller)
*
* @return $this
*/
final public function locale(string $locale)
final public function locale(string $locale): object
{
$this->route->addDefaults(['_locale' => $locale]);

Expand All @@ -154,7 +154,7 @@ final public function locale(string $locale)
*
* @return $this
*/
final public function format(string $format)
final public function format(string $format): object
{
$this->route->addDefaults(['_format' => $format]);

Expand Down
2 changes: 1 addition & 1 deletion Route.php
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ public function __serialize(): array
/**
* @internal
*/
final public function serialize()
final public function serialize(): string
{
return serialize($this->__serialize());
}
Expand Down

0 comments on commit 1dd13ed

Please sign in to comment.