Skip to content

Commit

Permalink
Merge branch '2.3' into 2.4
Browse files Browse the repository at this point in the history
* 2.3:
  Update validators.eu.xlf
  fixed CS
  remove unused imports
  Unify null comparisons
  [EventDispatcher] don't count empty listeners
  [Process] Fix unit tests in sigchild environment
  [Process] fix signal handling in wait()
  [BrowserKit] refactor code and fix unquoted regex
  Fixed server HTTP_HOST port uri conversion
  Bring code into standard
  [Process] Add test to verify fix for issue #11421
  [Process] Fixes issue #11421
  [DependencyInjection] Pass a Scope instance instead of a scope name.

Conflicts:
	src/Symfony/Component/EventDispatcher/Tests/EventDispatcherTest.php
  • Loading branch information
fabpot committed Jul 28, 2014
2 parents b495517 + f86f46b commit 8064070
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
1 change: 0 additions & 1 deletion Adapter/AbstractFindAdapter.php
Expand Up @@ -16,7 +16,6 @@
use Symfony\Component\Finder\Shell\Shell;
use Symfony\Component\Finder\Expression\Expression;
use Symfony\Component\Finder\Shell\Command;
use Symfony\Component\Finder\Iterator\SortableIterator;
use Symfony\Component\Finder\Comparator\NumberComparator;
use Symfony\Component\Finder\Comparator\DateComparator;

Expand Down
6 changes: 3 additions & 3 deletions Tests/Iterator/MockSplFileInfo.php
Expand Up @@ -50,7 +50,7 @@ public function __construct($param)

public function isFile()
{
if ($this->type === null) {
if (null === $this->type) {
return preg_match('/file/', $this->getFilename());
};

Expand All @@ -59,7 +59,7 @@ public function isFile()

public function isDir()
{
if ($this->type === null) {
if (null === $this->type) {
return preg_match('/directory/', $this->getFilename());
}

Expand All @@ -68,7 +68,7 @@ public function isDir()

public function isReadable()
{
if ($this->mode === null) {
if (null === $this->mode) {
return preg_match('/r\+/', $this->getFilename());
}

Expand Down

0 comments on commit 8064070

Please sign in to comment.