Skip to content

Commit 05eae77

Browse files
committed
check for empty needle when calling strpos, fixes #78
1 parent c133b45 commit 05eae77

File tree

4 files changed

+18
-1
lines changed

4 files changed

+18
-1
lines changed

CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
44
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
55

6+
## [2.1.1] - 2018-05-17
7+
### Changed
8+
- Check for empty needle when calling str_pos, fixes #78
9+
610
## [2.1.0] - 2018-04-06
711
### Changed
812
- PHPCS version 3.2.3 or later is required.

MO4/Sniffs/Formatting/UnnecessaryNamespaceUsageSniff.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ private function checkShorthandPossible(
364364
);
365365

366366
$replaceClassName = true;
367-
} else if (strpos($fullClassName, $namespace) === 0) {
367+
} else if ($namespace !== "" && strpos($fullClassName, $namespace) === 0) {
368368
$replacement = substr($fullClassName, strlen($namespace));
369369

370370
$data = [
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?php
2+
// bug #78
3+
4+
class C
5+
{
6+
/**
7+
* @return void
8+
*/
9+
public function f()
10+
{
11+
}
12+
}

MO4/Tests/Formatting/UnnecessaryNamespaceUsageUnitTest.php

+1
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ protected function getWarningList($testFile='')
6565
case 'UnnecessaryNamespaceUsageUnitTest.pass.2.inc':
6666
case 'UnnecessaryNamespaceUsageUnitTest.pass.3.inc':
6767
case 'UnnecessaryNamespaceUsageUnitTest.pass.4.inc':
68+
case 'UnnecessaryNamespaceUsageUnitTest.pass.5.inc':
6869
return [];
6970
case 'UnnecessaryNamespaceUsageUnitTest.fail.1.inc':
7071
return [

0 commit comments

Comments
 (0)