Skip to content

Commit

Permalink
docblock types
Browse files Browse the repository at this point in the history
  • Loading branch information
juliangut committed Feb 7, 2017
1 parent 980fc7d commit 38cfe08
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion src/App.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class App extends SlimApp
/**
* App constructor.
*
* @param Configuration $configuration
* @param Configuration|null $configuration
*
* @throws \RuntimeException
*/
Expand Down
12 changes: 6 additions & 6 deletions src/ContainerBuilder.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ class ContainerBuilder
/**
* Build PHP-DI container.
*
* @param Configuration $configuration
* @param Configuration|null $configuration
*
* @throws \RuntimeException
*
* @return \Interop\Container\ContainerInterface
* @return \DI\Container
*/
public static function build(Configuration $configuration = null)
{
Expand All @@ -41,7 +41,7 @@ public static function build(Configuration $configuration = null)
$containerBuilder->addDefinitions(require __DIR__ . '/definitions.php');

// Custom definitions
$containerBuilder->addDefinitions(static::parseDefinitions($configuration->getDefinitions()));
$containerBuilder->addDefinitions(self::parseDefinitions($configuration->getDefinitions()));

return $containerBuilder->build();
}
Expand Down Expand Up @@ -93,7 +93,7 @@ function ($definition) {
return $definition;
}

return static::loadDefinitionsFromPath($definition);
return self::loadDefinitionsFromPath($definition);
},
$definitions
);
Expand All @@ -117,13 +117,13 @@ private static function loadDefinitionsFromPath($path)
}

if (is_file($path)) {
return static::loadDefinitionsFromFile($path);
return self::loadDefinitionsFromFile($path);
}

$definitions = [];
foreach (glob($path . '/*.php', GLOB_ERR) as $file) {
if (is_file($file)) {
$definitions[] = static::loadDefinitionsFromFile($file);
$definitions[] = self::loadDefinitionsFromFile($file);
}
}

Expand Down

0 comments on commit 38cfe08

Please sign in to comment.