Merge branch 'release'

zendframework · Sep 13, 2012 · da23b85accd7c6107bd47410512805cff19e7058 · da23b85
2 parents b186150 + f496ccb
commit da23b85accd7c6107bd47410512805cff19e7058
Unified Split

Showing with 15 additions and 1 deletion.

+1 −1 library/Zend/Log/Writer/Syslog.php

+5 −0 tests/ZendTest/Log/TestAsset/CustomSyslogWriter.php

+9 −0 tests/ZendTest/Log/Writer/SyslogTest.php
diff --git a/library/Zend/Log/Writer/Syslog.php b/library/Zend/Log/Writer/Syslog.php
@@ -90,7 +90,7 @@ class Syslog extends AbstractWriter
     public function __construct(array $params = array())
     {
         if (isset($params['application'])) {
-            $this->application = $params['application'];
+            $this->appName = $params['application'];
         }
 
         $runInitializeSyslog = true;
diff --git a/tests/ZendTest/Log/TestAsset/CustomSyslogWriter.php b/tests/ZendTest/Log/TestAsset/CustomSyslogWriter.php
@@ -18,4 +18,9 @@ public function getFacility()
     {
         return $this->facility;
     }
+
+    public function getApplicationName()
+    {
+        return $this->appName;
+    }
 }
diff --git a/tests/ZendTest/Log/Writer/SyslogTest.php b/tests/ZendTest/Log/Writer/SyslogTest.php
@@ -93,4 +93,13 @@ public function testWriteWithFormatter()
 
         $writer->write($event);
     }
+
+    /**
+     * @group ZF2-534
+     */
+    public function testPassApplicationNameViaConstructor()
+    {
+        $writer   = new CustomSyslogWriter(array('application' => 'test_app'));
+        $this->assertEquals('test_app', $writer->getApplicationName());
+    }
 }