Merge branch 'feature/2927' into develop

Close zendframework/zendframework#2927

src/LoggerAwareTrait.php

@@ -0,0 +1,38 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Log
+ */
+
+namespace Zend\Log;
+
+use Zend\Log\LoggerInterface;
+
+/**
+ * @category  Zend
+ * @package   Zend_Log
+ */
+trait LoggerAwareTrait
+{
+    /**
+     * @var LoggerInterface
+     */
+    protected $logger = null;
+
+    /**
+     * Set logger object
+     *
+     * @param LoggerInterface $logger
+     * @return mixed
+     */
+    public function setLogger(LoggerInterface $logger)
+    {
+        $this->logger = $logger;
+
+        return $this;
+    }
+}

test/LoggerAwareTraitTest.php

@@ -0,0 +1,33 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Log
+ */
+
+namespace ZendTest\Log;
+
+use \PHPUnit_Framework_TestCase as TestCase;
+use \Zend\Log\Logger;
+
+/**
+ * @requires PHP 5.4
+ */
+class LoggerAwareTraitTest extends TestCase
+{
+    public function testSetLogger()
+    {
+        $object = $this->getObjectForTrait('\Zend\Log\LoggerAwareTrait');
+
+        $this->assertAttributeEquals(null, 'logger', $object);
+
+        $logger = new Logger;
+
+        $object->setLogger($logger);
+
+        $this->assertAttributeEquals($logger, 'logger', $object);
+    }
+}