Skip to content

Commit

Permalink
update documentation
Browse files Browse the repository at this point in the history
  • Loading branch information
juliangut committed Apr 25, 2016
1 parent 96f1522 commit 4838995
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 7 deletions.
8 changes: 8 additions & 0 deletions src/Container.php
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@ public function offsetSet($offset, $value)
*
* @param string $offset
*
* @throws \Slim\Exception\ContainerValueNotFoundException
*
* @return mixed
*/
public function offsetGet($offset)
Expand All @@ -74,6 +76,8 @@ public function offsetGet($offset)
*
* @param string $offset
*
* @throws \InvalidArgumentException
*
* @return bool
*/
public function offsetExists($offset)
Expand All @@ -99,6 +103,8 @@ public function offsetUnset($offset)
*
* @param string $name
*
* @throws \Slim\Exception\ContainerValueNotFoundException
*
* @return mixed
*/
public function __get($name)
Expand All @@ -111,6 +117,8 @@ public function __get($name)
*
* @param string $name
*
* @throws \InvalidArgumentException
*
* @return bool
*/
public function __isset($name)
Expand Down
16 changes: 9 additions & 7 deletions src/ContainerBuilder.php
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,13 @@ public static function build(array $values = [], array $definitions = [])
$containerBuilder = new DIContainerBuilder('\Jgut\Slim\PHPDI\Container');

$userSettings = [];
if (isset($values['settings'])) {
if (array_key_exists('settings', $values)) {
$userSettings = $values['settings'];

unset($values['settings']);
}

if (isset($userSettings['php-di']) && is_array($userSettings['php-di'])) {
if (array_key_exists('php-di', $userSettings) && is_array($userSettings['php-di'])) {
$containerBuilder = self::configureContainerBuilder($containerBuilder, $userSettings['php-di']);
$containerBuilder = self::configureContainerProxies($containerBuilder, $userSettings['php-di']);
$containerBuilder = self::configureContainerCache($containerBuilder, $userSettings['php-di']);
Expand Down Expand Up @@ -91,15 +91,15 @@ public static function build(array $values = [], array $definitions = [])
*/
private static function configureContainerBuilder(DIContainerBuilder $containerBuilder, array $settings)
{
if (isset($settings['use_autowiring'])) {
if (array_key_exists('use_autowiring', $settings)) {
$containerBuilder->useAutowiring((bool) $settings['use_autowiring']);
}

if (isset($settings['use_annotations'])) {
if (array_key_exists('use_annotations', $settings)) {
$containerBuilder->useAnnotations((bool) $settings['use_annotations']);
}

if (isset($settings['ignore_phpdoc_errors'])) {
if (array_key_exists('ignore_phpdoc_errors', $settings)) {
$containerBuilder->ignorePhpDocErrors((bool) $settings['ignore_phpdoc_errors']);
}

Expand All @@ -112,11 +112,13 @@ private static function configureContainerBuilder(DIContainerBuilder $containerB
* @param \DI\ContainerBuilder $containerBuilder
* @param array $settings
*
* @throws \InvalidArgumentException
*
* @return \DI\ContainerBuilder
*/
private static function configureContainerProxies(DIContainerBuilder $containerBuilder, array $settings)
{
if (isset($settings['proxy_path']) && !empty($settings['proxy_path'])) {
if (array_key_exists('proxy_path', $settings) && !empty($settings['proxy_path'])) {
$containerBuilder->writeProxiesToFile(true, $settings['proxy_path']);
}

Expand All @@ -133,7 +135,7 @@ private static function configureContainerProxies(DIContainerBuilder $containerB
*/
private static function configureContainerCache(DIContainerBuilder $containerBuilder, array $settings)
{
if (isset($settings['definitions_cache'])) {
if (array_key_exists('definitions_cache', $settings)) {
$containerBuilder->setDefinitionCache($settings['definitions_cache']);
}

Expand Down

0 comments on commit 4838995

Please sign in to comment.