Skip to content
This repository has been archived by the owner on Jan 30, 2020. It is now read-only.

Commit

Permalink
Merge branch 'hotfix/4349' into develop
Browse files Browse the repository at this point in the history 
Close zendframework/zendframework#4349
  • Loading branch information
@weierophinney
weierophinney committed Apr 29, 2013
115 parents 99877b7 + 8a757cf + 0933607 + 34ed3ed + 83f6472 + db74e8c + 7b75da1 + bb4c48f + 9fa3c05 + 139c0b1 + a587eef + 7a782f4 + 39cb2e2 + 31f8c80 + a9b7779 + de058f6 + 67b97f6 + 40d86d0 + b5234cc + 17b4e13 + 8af24aa + 1a9df55 + 2c85c99 + 5557fac + fe78a35 + f6430c3 + 6041a1e + 86b9031 + 674bd75 + 67a1bfb + 4d4dd8b + c655082 + dbb18b2 + 97a9134 + 80367df + 98d5255 + 7946c9f + ea67c13 + 44df0b2 + 38e090d + 7af74e7 + 8b311b1 + e2c2b94 + 51601cb + dcc1eaf + 6f4b805 + a30a64f + ee7347d + 8b04bfe + b487f00 + ecdfdf6 + d8cde75 + b7a33bb + 65ecb58 + 571d938 + 625a786 + 6fe4efc + f94838d + 76607e3 + 492076c + 17b56b8 + c5509fe + e0fa433 + 7d74e99 + 309136e + f1dd38a + 7be533f + 6a618c2 + 3a454e3 + f66ca80 + f1bebf2 + 850249d + 674d7ba + 597ff82 + ae87c49 + fb156fb + 9c474de + 1a75c72 + 47d1cd2 + a937ea3 + 4219922 + 49e380f + 5903df6 + 7a9d632 + 2ef7274 + b606220 + a09c5c7 + 21afa5c + 8faa67f + 1731915 + efa1bb3 + 5576455 + 86d3ae8 + de3fd70 + 398a3c4 + 5c56554 + 7ad896f + fa91c9b + 1372a45 + a0c8737 + e368d53 + 462b1f7 + 79675fe + a8104b9 + 91ed9d0 + b1d1358 + 6a0c90c + 5e4258f + 239c0d0 + b457c76 + a2533a4 + beb6598 + 79d0f46 + 1519723 + eda15dd commit c9baa9a
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions src/Writer/FilterPluginManager.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@

namespace Zend\Log\Writer;

use Zend\ServiceManager\AbstractPluginManager;
use Zend\Log\Filter;
use Zend\Log\Exception;
use Zend\Log\Filter;
use Zend\ServiceManager\AbstractPluginManager;

class FilterPluginManager extends AbstractPluginManager
{
Expand Down
6 changes: 3 additions & 3 deletions src/Writer/FingersCrossed.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@

use Traversable;
use Zend\Stdlib\ArrayUtils;
use Zend\Log\Filter\Priority as PriorityFilter;
use Zend\Log\Exception;
use Zend\Log\Filter\FilterInterface;
use Zend\Log\Filter\Priority as PriorityFilter;
use Zend\Log\Formatter\FormatterInterface;
use Zend\Log\Exception;
use Zend\Log\Logger;
use Zend\Log\Writer\WriterInterface;
use Zend\Log\Writer\AbstractWriter;
use Zend\Log\Writer\WriterInterface;
use Zend\Log\WriterPluginManager;

/**
Expand Down
2 changes: 1 addition & 1 deletion src/Writer/FirePhp.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@

use Traversable;
use FirePHP as FirePHPService;
use Zend\Log\Exception;
use Zend\Log\Formatter\FirePhp as FirePhpFormatter;
use Zend\Log\Logger;
use Zend\Log\Exception;
use FirePhp\FirePhpInterface;

class FirePhp extends AbstractWriter
Expand Down
4 changes: 2 additions & 2 deletions src/Writer/FormatterPluginManager.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@

namespace Zend\Log\Writer;

use Zend\ServiceManager\AbstractPluginManager;
use Zend\Log\Formatter;
use Zend\Log\Exception;
use Zend\Log\Formatter;
use Zend\ServiceManager\AbstractPluginManager;

class FormatterPluginManager extends AbstractPluginManager
{
Expand Down
2 changes: 1 addition & 1 deletion src/Writer/Syslog.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@

use Traversable;
use Zend\Log\Exception;
use Zend\Log\Logger;
use Zend\Log\Formatter\Simple as SimpleFormatter;
use Zend\Log\Logger;

/**
* Writes log messages to syslog
Expand Down

0 comments on commit c9baa9a

Please sign in to comment.