Merge pull request #1229 from mariansollmann/issue-1229

Remove ApplicationName
cargomedia · May 19, 2014 · 8f8e8f7 · 8f8e8f7
2 parents 60263e9 + e44341c
commit 8f8e8f7
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 14 deletions.
diff --git a/library/CM/Site/Abstract.php b/library/CM/Site/Abstract.php
@@ -79,13 +79,6 @@ public function getName() {
         return self::_getConfig()->name;
     }
 
-    /**
-     * @return string
-     */
-    public function getApplicationName() {
-        return $this->_getConfig()->applicationName;
-    }
-
     /**
      * @return string Theme
      */

diff --git a/tests/library/CM/Site/AbstractTest.php b/tests/library/CM/Site/AbstractTest.php
@@ -7,7 +7,6 @@ public static function setUpBeforeClass() {
         CM_Config::get()->CM_Site_Abstract->urlCdn = 'http://www.cdn.com';
         CM_Config::get()->CM_Site_Abstract->name = 'Foo';
         CM_Config::get()->CM_Site_Abstract->emailAddress = '[email protected]';
-        CM_Config::get()->CM_Site_Abstract->applicationName = 'Bar';
     }
 
     public function testGetAll() {
@@ -28,12 +27,6 @@ public function testGetName() {
         $this->assertEquals('Foo', $site->getName());
     }
 
-    public function testGetApplicationName() {
-        /** @var CM_Site_Abstract $site */
-        $site = $this->getMockForAbstractClass('CM_Site_Abstract');
-        $this->assertEquals('Bar', $site->getApplicationName());
-    }
-
     public function testGetUrl() {
         /** @var CM_Site_Abstract $site */
         $site = $this->getMockForAbstractClass('CM_Site_Abstract');