Mirrors/wiosna-dev_common-library
1
0
Fork 1
mirror of https://github.com/wiosna-dev/common-library.git synced 2026-03-12 01:31:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix coding standard (no_blank_lines_after_phpdoc, single_blank_line_before_namespace, yoda_style)

Browse Source
This commit is contained in:
Meritoo
2017-09-20 09:27:56 +02:00
parent e1fefcdeae
commit 7aa2239dbd
12 changed files with 69 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Meritoo/Common/Collection/Collection.php
View File

@@ -109,7 +109,7 @@ class Collection implements Countable, ArrayAccess, IteratorAggregate
*/
public function add($element, $index = null)
{
if ($index === null) {
if (null === $index) {
$this->elements[] = $element;
} else {
$this->elements[$index] = $element;
@@ -216,7 +216,7 @@ class Collection implements Countable, ArrayAccess, IteratorAggregate
{
$index = Arrays::getIndexOf($this->elements, $element);
return $index !== null && $index !== false;
return null !== $index && false !== $index;
}
/**

2
src/Meritoo/Common/Type/Base/BaseType.php
View File

@@ -33,7 +33,7 @@ abstract class BaseType
*/
public function getAll()
{
if ($this->all === null) {
if (null === $this->all) {
$this->all = Reflection::getConstants($this);
}

16
src/Meritoo/Common/Utilities/Arrays.php
View File

@@ -415,7 +415,7 @@ class Arrays
* var autoGeneratedVariable = new Array(...);autoGeneratedVariable[0] = new Array(...);
* autoGeneratedVariable[1] = new Array(...);
*/
if ($counter === 1) {
if (1 === $counter) {
$effect .= "\n";
}
@@ -758,7 +758,7 @@ class Arrays
foreach ($exploded as $item) {
$exploded2 = explode($valuesKeysSeparator, $item);
if (count($exploded2) == 2) {
if (2 == count($exploded2)) {
$key = trim($exploded2[0]);
$value = trim($exploded2[1]);
@@ -1124,7 +1124,7 @@ class Arrays
if (!empty($array)) {
$childPosition = 1;
if ($startPosition !== null) {
if (null !== $startPosition) {
$array[$keyName] = $startPosition;
}
@@ -1316,7 +1316,7 @@ class Arrays
*
* If one of the above is true, not all elements of given array are empty
*/
if ((!is_array($element) && $strictNull && $element !== null) || !empty($element)) {
if ((!is_array($element) && $strictNull && null !== $element) || !empty($element)) {
return false;
}
}
@@ -1353,7 +1353,7 @@ class Arrays
* Values should be compared only and both arrays are one-dimensional?
* Let's find difference by using simple function
*/
if ($valuesOnly && self::getDimensionsCount($array1) == 1 && self::getDimensionsCount($array2) == 1) {
if ($valuesOnly && 1 == self::getDimensionsCount($array1) && 1 == self::getDimensionsCount($array2)) {
return array_diff($array1, $array2);
}
@@ -1381,7 +1381,7 @@ class Arrays
}
}
if ($difference !== null) {
if (null !== $difference) {
$effect[] = $difference;
}
} else {
@@ -1472,7 +1472,7 @@ class Arrays
* Start index not provided?
* Let's look for the first index / key of given array
*/
if ($startIndex === null) {
if (null === $startIndex) {
$startIndex = self::getFirstKey($array);
}
@@ -1617,7 +1617,7 @@ class Arrays
* Index of element or of element's key is unknown?
* Probably the element does not exist in given array, so... nothing to do
*/
if ($elementKey === null || $indexOfKey === null) {
if (null === $elementKey || null === $indexOfKey) {
return null;
}

2
src/Meritoo/Common/Utilities/Composer.php
View File

@@ -59,7 +59,7 @@ class Composer
* Unknown data from the composer.json file or there is no node with given name?
* Nothing to do
*/
if ($data === null || !isset($data->{$nodeName})) {
if (null === $data || !isset($data->{$nodeName})) {
return null;
}

36
src/Meritoo/Common/Utilities/Date.php
View File

@@ -129,10 +129,10 @@ class Date
$dateStart = new DateTime();
$dateEnd = new DateTime();
if ($period == DatePeriod::LAST_YEAR || $period == DatePeriod::NEXT_YEAR) {
if (DatePeriod::LAST_YEAR == $period || DatePeriod::NEXT_YEAR == $period) {
$yearDifference = 1;
if ($period == DatePeriod::LAST_YEAR) {
if (DatePeriod::LAST_YEAR == $period) {
$yearDifference *= -1;
}
@@ -148,7 +148,7 @@ class Date
break;
}
if ($dateStart !== null && $dateEnd !== null) {
if (null !== $dateStart && null !== $dateEnd) {
$dateStart->setTime(0, 0, 0);
$dateEnd->setTime(23, 59, 59);
@@ -311,7 +311,7 @@ class Date
$encoding = mb_detect_encoding($name);
if ($encoding === false) {
if (false === $encoding) {
$name = mb_convert_encoding($name, 'UTF-8', 'ISO-8859-2');
}
@@ -378,46 +378,46 @@ class Date
self::DATE_DIFFERENCE_UNIT_MINUTES,
];
if ($differenceUnit === null || $differenceUnit == self::DATE_DIFFERENCE_UNIT_YEARS) {
if (null === $differenceUnit || self::DATE_DIFFERENCE_UNIT_YEARS == $differenceUnit) {
$diff = $dateEnd->diff($dateStart);
/*
* Difference between dates in years should be returned only?
*/
if ($differenceUnit == self::DATE_DIFFERENCE_UNIT_YEARS) {
if (self::DATE_DIFFERENCE_UNIT_YEARS == $differenceUnit) {
return $diff->y;
}
$difference[self::DATE_DIFFERENCE_UNIT_YEARS] = $diff->y;
}
if ($differenceUnit === null || $differenceUnit == self::DATE_DIFFERENCE_UNIT_MONTHS) {
if (null === $differenceUnit || self::DATE_DIFFERENCE_UNIT_MONTHS == $differenceUnit) {
$diff = $dateEnd->diff($dateStart);
/*
* Difference between dates in months should be returned only?
*/
if ($differenceUnit == self::DATE_DIFFERENCE_UNIT_MONTHS) {
if (self::DATE_DIFFERENCE_UNIT_MONTHS == $differenceUnit) {
return $diff->m;
}
$difference[self::DATE_DIFFERENCE_UNIT_MONTHS] = $diff->m;
}
if ($differenceUnit === null || in_array($differenceUnit, $relatedUnits)) {
if (null === $differenceUnit || in_array($differenceUnit, $relatedUnits)) {
$days = (int)floor($dateDiff / $daySeconds);
/*
* Difference between dates in days should be returned only?
*/
if ($differenceUnit == self::DATE_DIFFERENCE_UNIT_DAYS) {
if (self::DATE_DIFFERENCE_UNIT_DAYS == $differenceUnit) {
return $days;
}
/*
* All units should be returned?
*/
if ($differenceUnit === null) {
if (null === $differenceUnit) {
$difference[self::DATE_DIFFERENCE_UNIT_DAYS] = $days;
}
@@ -427,20 +427,20 @@ class Date
$daysInSeconds = $days * $daySeconds;
}
if ($differenceUnit === null || in_array($differenceUnit, $relatedUnits)) {
if (null === $differenceUnit || in_array($differenceUnit, $relatedUnits)) {
$hours = (int)floor(($dateDiff - $daysInSeconds) / $hourSeconds);
/*
* Difference between dates in hours should be returned only?
*/
if ($differenceUnit == self::DATE_DIFFERENCE_UNIT_HOURS) {
if (self::DATE_DIFFERENCE_UNIT_HOURS == $differenceUnit) {
return $hours;
}
/*
* All units should be returned?
*/
if ($differenceUnit === null) {
if (null === $differenceUnit) {
$difference[self::DATE_DIFFERENCE_UNIT_HOURS] = $hours;
}
@@ -450,13 +450,13 @@ class Date
$hoursInSeconds = $hours * $hourSeconds;
}
if ($differenceUnit === null || $differenceUnit == self::DATE_DIFFERENCE_UNIT_MINUTES) {
if (null === $differenceUnit || self::DATE_DIFFERENCE_UNIT_MINUTES == $differenceUnit) {
$minutes = (int)floor(($dateDiff - $daysInSeconds - $hoursInSeconds) / 60);
/*
* Difference between dates in minutes should be returned only?
*/
if ($differenceUnit == self::DATE_DIFFERENCE_UNIT_MINUTES) {
if (self::DATE_DIFFERENCE_UNIT_MINUTES == $differenceUnit) {
return $minutes;
}
@@ -524,7 +524,7 @@ class Date
*/
public static function getRandomDate(DateTime $startDate = null, $start = 1, $end = 100, $intervalTemplate = 'P%sD')
{
if ($startDate === null) {
if (null === $startDate) {
$startDate = new DateTime();
}
@@ -590,7 +590,7 @@ class Date
*/
$dateFromFormat = DateTime::createFromFormat($dateFormat, $value);
if ($dateFromFormat === false) {
if (false === $dateFromFormat) {
/*
* Nothing to do more, because:
* a) instance of the DateTime was created

2
src/Meritoo/Common/Utilities/DatePeriod.php
View File

@@ -140,7 +140,7 @@ class DatePeriod
/*
* Unknown date or format is invalid?
*/
if ($date === null || !Date::isValidDateFormat($format)) {
if (null === $date || !Date::isValidDateFormat($format)) {
return '';
}

30
src/Meritoo/Common/Utilities/Miscellaneous.php
View File

@@ -65,7 +65,7 @@ class Miscellaneous
if (!empty($directoryContent)) {
foreach ($directoryContent as $fileName) {
if ($fileName != '.' && $fileName != '..') {
if ('.' != $fileName && '..' != $fileName) {
$content = null;
if (!empty($startFileName) && !$startFileFound) {
@@ -80,7 +80,7 @@ class Miscellaneous
$content = self::getDirectoryContent($directoryPath . $fileName, true, $maxFilesCount - $count);
}
if ($content !== null) {
if (null !== $content) {
$files[$fileName] = $content;
if (!empty($maxFilesCount)) {
@@ -365,7 +365,7 @@ class Miscellaneous
* Oops, cannot instantiate converter
* Nothing to do
*/
if ($converter === null) {
if (null === $converter) {
return '';
}
@@ -460,7 +460,7 @@ class Miscellaneous
* Value to find is neither a string nor an array OR it's an empty string?
* Nothing to do
*/
if ((!$searchIsString && !$searchIsArray) || ($searchIsString && strlen($search) == 0)) {
if ((!$searchIsString && !$searchIsArray) || ($searchIsString && 0 == strlen($search))) {
return $effect;
}
@@ -612,7 +612,7 @@ class Miscellaneous
$effect = mb_substr($text, 0, $maxLength, 'utf-8');
$lastSpacePosition = mb_strrpos($effect, ' ', 'utf-8');
if ($lastSpacePosition !== false) {
if (false !== $lastSpacePosition) {
$effect = mb_substr($effect, 0, $lastSpacePosition, 'utf-8');
}
@@ -730,7 +730,7 @@ class Miscellaneous
}
foreach (scandir($directoryPath) as $item) {
if ($item == '.' || $item == '..') {
if ('.' == $item || '..' == $item) {
continue;
}
@@ -776,7 +776,7 @@ class Miscellaneous
foreach ($members as $key => $value) {
$value = mb_strtolower($value);
if ($key == 0) {
if (0 == $key) {
$effect .= self::lowercaseFirst($value);
} else {
$effect .= self::uppercaseFirst($value);
@@ -812,7 +812,7 @@ class Miscellaneous
if ($restLowercase) {
$effect = mb_strtolower($effect);
} elseif ($restLowercase === false) {
} elseif (false === $restLowercase) {
$effect = mb_strtoupper($effect);
}
@@ -850,7 +850,7 @@ class Miscellaneous
if ($restLowercase) {
$effect = mb_strtolower($effect);
} elseif ($restLowercase === false) {
} elseif (false === $restLowercase) {
$effect = mb_strtoupper($effect);
}
@@ -1153,7 +1153,7 @@ class Miscellaneous
{
$value = filter_input($globalSourceType, $variableName);
if ($value === null) {
if (null === $value) {
$globalSource = null;
switch ($globalSourceType) {
@@ -1178,7 +1178,7 @@ class Miscellaneous
break;
}
if ($globalSource !== null && isset($globalSource[$variableName])) {
if (null !== $globalSource && isset($globalSource[$variableName])) {
$value = $globalSource[$variableName];
if (!ini_get('magic_quotes_gpc')) {
@@ -1232,7 +1232,7 @@ class Miscellaneous
/*
* First line is only HTTP status and is unneeded so skip it
*/
if ($i === 0) {
if (0 === $i) {
continue;
}
@@ -1242,7 +1242,7 @@ class Miscellaneous
/*
* If the header is a "set-cookie" let's save it to "cookies" array
*/
if ($key === 'Set-Cookie') {
if ('Set-Cookie' === $key) {
$cookieParameters = explode(';', $value);
$name = '';
@@ -1260,7 +1260,7 @@ class Miscellaneous
* First parameter will be always a cookie name and it's value. It is not needed to run
* further actions for them, so save the values and move to next parameter.
*/
if ($j === 0) {
if (0 === $j) {
$name = trim($param[0]);
$value = trim($param[1]);
continue;
@@ -1416,7 +1416,7 @@ class Miscellaneous
if ($asHexadecimal) {
$hexadecimal = dechex($colorComponent);
if (strlen($hexadecimal) == 1) {
if (1 == strlen($hexadecimal)) {
return sprintf('0%s', $hexadecimal, $hexadecimal);
}

4
src/Meritoo/Common/Utilities/QueryBuilderUtility.php
View File

@@ -108,7 +108,7 @@ class QueryBuilderUtility
$compareOperator = '=';
if (is_array($value) && !empty($value)) {
if (count($value) == 2) {
if (2 == count($value)) {
$compareOperator = $value[1];
}
@@ -117,7 +117,7 @@ class QueryBuilderUtility
$predicate = sprintf('%s.%s %s :%s', $alias, $column, $compareOperator, $column);
if ($value === null) {
if (null === $value) {
$predicate = $queryBuilder->expr()->isNull(sprintf('%s.%s', $alias, $column));
unset($criteria[$column]);
} else {

16
src/Meritoo/Common/Utilities/Reflection.php
View File

@@ -201,7 +201,7 @@ class Reflection
* Krzysztof Niziol <krzysztof.niziol@meritoo.pl>
* 2016-11-07
*/
if ($object !== null) {
if (null !== $object) {
unset($exploded[0]);
$property = implode('.', $exploded);
@@ -246,7 +246,7 @@ class Reflection
}
}
if (!$valueFound && $reflectionProperty !== null) {
if (!$valueFound && null !== $reflectionProperty) {
/*
* Oops, we have got exception.
*
@@ -285,7 +285,7 @@ class Reflection
foreach ($objects as $entity) {
$value = self::getPropertyValue($entity, $property, $force);
if ($value !== null) {
if (null !== $value) {
$values[] = $value;
}
}
@@ -345,7 +345,7 @@ class Reflection
if ($withoutNamespace) {
$classOnly = Miscellaneous::getLastElementOfString($name, '\\');
if ($classOnly !== null) {
if (null !== $classOnly) {
$name = $classOnly;
}
@@ -427,7 +427,7 @@ class Reflection
$className = self::getClassName($source);
$reflection = new ReflectionClass($className);
if ($filter === null) {
if (null === $filter) {
$filter = ReflectionProperty::IS_PRIVATE
+ ReflectionProperty::IS_PROTECTED
+ ReflectionProperty::IS_PUBLIC
@@ -477,7 +477,7 @@ class Reflection
/*
* Oops, cannot resolve class
*/
if ($className === null) {
if (null === $className) {
throw new CannotResolveClassNameException($class);
}
@@ -603,7 +603,7 @@ class Reflection
if (!$uses && $verifyParents) {
$parentClassName = self::getParentClassName($className);
if ($parentClassName !== null) {
if (null !== $parentClassName) {
return self::usesTrait($parentClassName, $trait, true);
}
}
@@ -624,7 +624,7 @@ class Reflection
$reflection = new ReflectionClass($className);
$parentClass = $reflection->getParentClass();
if ($parentClass === null || $parentClass === false) {
if (null === $parentClass || false === $parentClass) {
return null;
}

18
src/Meritoo/Common/Utilities/Regex.php
View File

@@ -84,7 +84,7 @@ class Regex
$taxid = preg_replace('/[\s-]/', '', $taxidString);
$sum = 0;
if (strlen($taxid) == 10 && is_numeric($taxid)) {
if (10 == strlen($taxid) && is_numeric($taxid)) {
for ($x = 0; $x <= 8; ++$x) {
$sum += $taxid[$x] * $weights[$x];
}
@@ -185,9 +185,9 @@ class Regex
$pattern = '|' . $filterExpression . '|';
$matchesCount = preg_match($pattern, $value, $matches);
$remove = $matchesCount == 0;
$remove = 0 == $matchesCount;
} else {
if ($value == '') {
if ('' == $value) {
$value = '\'\'';
} elseif (is_string($value)) {
$value = '\'' . $value . '\'';
@@ -431,7 +431,7 @@ class Regex
public static function startsWith($string, $beginning)
{
if (!empty($string) && !empty($beginning)) {
if (strlen($beginning) == 1 && !self::isLetterOrDigit($beginning)) {
if (1 == strlen($beginning) && !self::isLetterOrDigit($beginning)) {
$beginning = '\\' . $beginning;
}
@@ -452,7 +452,7 @@ class Regex
*/
public static function endsWith($string, $ending)
{
if (strlen($ending) == 1 && !self::isLetterOrDigit($ending)) {
if (1 == strlen($ending) && !self::isLetterOrDigit($ending)) {
$ending = '\\' . $ending;
}
@@ -537,7 +537,7 @@ class Regex
*/
public static function contains($haystack, $needle)
{
if (strlen($needle) == 1 && !self::isLetterOrDigit($needle)) {
if (1 == strlen($needle) && !self::isLetterOrDigit($needle)) {
$needle = '\\' . $needle;
}
@@ -653,7 +653,7 @@ class Regex
}
$modulo = $sum % 11;
$numberControl = ($modulo == 10) ? 0 : $modulo;
$numberControl = (10 == $modulo) ? 0 : $modulo;
return $numberControl == $nip[9];
}
@@ -698,10 +698,10 @@ class Regex
$color = Miscellaneous::replace($color, '/#/', '');
$length = strlen($color);
if ($length === 3) {
if (3 === $length) {
$color = Miscellaneous::replace($color, '/(.)(.)(.)/', '$1$1$2$2$3$3');
} else {
if ($length !== 6) {
if (6 !== $length) {
if ($throwException) {
throw new IncorrectColorHexLengthException($color);
}

6
src/Meritoo/Common/Utilities/Repository.php
View File

@@ -31,14 +31,14 @@ class Repository
{
$position = self::getExtremePosition($items, $asLast);
if ($position === null && $force) {
if (null === $position && $force) {
$position = 0;
}
if ($position !== null && !empty($items)) {
if (null !== $position && !empty($items)) {
foreach ($items as $item) {
if (method_exists($item, 'getPosition')) {
if ($item->getPosition() === null) {
if (null === $item->getPosition()) {
if ($asLast) {
++$position;
} else {

2
src/Meritoo/Common/Utilities/Xml.php
View File

@@ -40,7 +40,7 @@ class Xml
$query = $path->query('/*/*');
$nodesCount = $query->length;
if ($nodesCount == 0) {
if (0 == $nodesCount) {
return $element1;
}