phpmyadmin · nijel · Mar 22, 2017 · Mar 8, 2017 · Mar 8, 2017 · Mar 10, 2017
diff --git a/composer.json b/composer.json
@@ -36,7 +36,8 @@
         "phpmyadmin/motranslator": "^3.0",
         "phpmyadmin/shapefile": "^2.0",
         "phpseclib/phpseclib": "^2.0",
-        "google/recaptcha": "^1.1"
+        "google/recaptcha": "^1.1",
+        "psr/container": "^1.0"
     },
     "conflict": {
         "tecnickcom/tcpdf": "<6.2"

diff --git a/libraries/di/Container.php b/libraries/di/Container.php
@@ -7,14 +7,15 @@
  */
 namespace PMA\libraries\di;
 
+use Psr\Container\ContainerInterface;
+
 /**
  * Class Container
  *
  * @package PMA\libraries\di
  */
-class Container
+class Container implements ContainerInterface
 {
-
     /**
      * @var Item[] $content
      */
@@ -46,19 +47,58 @@ public function __construct(Container $base = null)
      * @param string $name   Name
      * @param array  $params Parameters
      *
+     * @throws NotFoundException  No entry was found for **this** identifier.
+     * @throws ContainerException Error while retrieving the entry.
+     *
      * @return mixed
      */
     public function get($name, $params = array())
+    {
+        try {
+            if (!$this->has($name)) {
+                throw new NotFoundException("No entry was found for $name identifier.");
+            }
+        } catch (NotFoundException $e) {
+            echo $e->getMessage();
+            return null;
+        }
+
+        try {
+            if (isset($this->content[$name])) {
+                return $this->content[$name]->get($params);
+            } else if (isset($GLOBALS[$name])) {
+                return $GLOBALS[$name];
+            } else {
+                throw new ContainerException("Error while retrieving the entry.");
+            }
+        } catch (ContainerException $e) {
+            echo $e->getMessage();
+            return null;
+        }
+    }
+
+    /**
+     * Returns true if the container can return an entry for the given identifier.
+     * Returns false otherwise.
+     *
+     * `has($name)` returning true does not mean that `get($name)` will not throw an exception.
+     * It does however mean that `get($name)` will not throw a `NotFoundException`.
+     *
+     * @param string $name Identifier of the entry to look for.
+     *
+     * @return bool
+     */
+    public function has($name)
     {
         if (isset($this->content[$name])) {
-            return $this->content[$name]->get($params);
+            return true;
         }
 
         if (isset($GLOBALS[$name])) {
-            return $GLOBALS[$name];
+            return true;
         }
 
-        return null;
+        return false;
     }
 
     /**

diff --git a/libraries/di/ContainerException.php b/libraries/di/ContainerException.php
@@ -0,0 +1,21 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * Holds the PMA\libraries\di\ContainerException class
+ *
+ * @package PMA
+ */
+namespace PMA\libraries\di;
+
+use Exception;
+use Psr\Container\ContainerExceptionInterface;
+
+/**
+ * Class ContainerException
+ *
+ * @package PMA\libraries\di
+ */
+class ContainerException extends Exception implements ContainerExceptionInterface
+{
+
+}
diff --git a/libraries/di/NotFoundException.php b/libraries/di/NotFoundException.php
@@ -0,0 +1,20 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * Holds the PMA\libraries\di\NotFoundException class
+ *
+ * @package PMA
+ */
+namespace PMA\libraries\di;
+
+use Psr\Container\NotFoundExceptionInterface;
+
+/**
+ * Class NotFoundException
+ *
+ * @package PMA\libraries\di
+ */
+class NotFoundException extends ContainerException implements NotFoundExceptionInterface
+{
+
+}
diff --git a/test/classes/di/ContainerTest.php b/test/classes/di/ContainerTest.php
@@ -0,0 +1,93 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * Tests for PMA\libraries\di\Container class
+ *
+ * @package PhpMyAdmin-test
+ */
+
+/*
+ * Include to test.
+ */
+require_once 'test/PMATestCase.php';
+
+use PMA\libraries\di\Container;
+
+/**
+ * Tests for PMA\libraries\di\Container class
+ *
+ * @package PhpMyAdmin-test
+ */
+class ContainerTest extends PMATestCase
+{
+    /**
+     * @access protected
+     */
+    protected $container;
+
+    /**
+     * Sets up the fixture.
+     * This method is called before a test is executed.
+     *
+     * @access protected
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->container = new Container();
+    }
+
+    /**
+     * Tears down the fixture.
+     * This method is called after a test is executed.
+     *
+     * @access protected
+     * @return void
+     */
+    protected function tearDown()
+    {
+        unset($this->container);
+    }
+
+    /**
+     * Test for get
+     *
+     * @return void
+     */
+    public function testGetWithValidEntry()
+    {
+        $this->container->set('name', 'value');
+        $this->assertSame('value', $this->container->get('name'));
+    }
+
+    /**
+     * Test for get
+     * @expectedExceptionMessageRegExp #Right.*#
+     * @return void
+     */
+    public function testGetWithInvalidEntry()
+    {
+        $this->assertSame(null, $this->container->get('invalid'));
+    }
+
+    /**
+     * Test for has
+     *
+     * @return void
+     */
+    public function testHasReturnsTrueForValidEntry()
+    {
+        $this->container->set('name', 'value');
+        $this->assertTrue($this->container->has('name'));
+    }
+
+    /**
+     * Test for has
+     *
+     * @return void
+     */
+    public function testHasReturnsFalseForInvalidEntry()
+    {
+        $this->assertFalse($this->container->has('name'));
+    }
+}