Merge pull request #158 from fezfez/small-impovement

Use str_starts_with and str_contains where possible

Author: Ocramius

psalm-baseline.xml

@@ -481,7 +481,8 @@
     <MissingReturnType occurrences="1">
       <code>initEnvironmentConstants</code>
     </MissingReturnType>
-    <MixedArgument occurrences="2">
+    <MixedArgument occurrences="3">
+      <code>$constant</code>
       <code>$n</code>
       <code>$value</code>
     </MixedArgument>

src/Generator/ClassGenerator.php

@@ -21,6 +21,7 @@
 use function method_exists;
 use function rtrim;
 use function sprintf;
+use function str_contains;
 use function str_replace;
 use function strpos;
 use function strrpos;
@@ -285,7 +286,7 @@ public function __construct(
      */
     public function setName($name)
     {
-        if (false !== strpos($name, '\\')) {
+        if (str_contains($name, '\\')) {
             $namespace = substr($name, 0, strrpos($name, '\\'));
             $name      = substr($name, strrpos($name, '\\') + 1);
             $this->setNamespaceName($namespace);

src/Generator/DocBlock/TagManager.php

@@ -9,6 +9,7 @@
 use ReflectionMethod;
 
 use function method_exists;
+use function str_starts_with;
 use function strpos;
 use function substr;
 use function ucfirst;
@@ -52,12 +53,12 @@ public function createTagFromReflection(ReflectionTagInterface $reflectionTag)
         // transport any properties via accessors and mutators from reflection to codegen object
         $reflectionClass = new ReflectionClass($reflectionTag);
         foreach ($reflectionClass->getMethods(ReflectionMethod::IS_PUBLIC) as $method) {
-            if (0 === strpos($method->getName(), 'get')) {
+            if (str_starts_with($method->getName(), 'get')) {
                 $propertyName = substr($method->getName(), 3);
                 if (method_exists($newTag, 'set' . $propertyName)) {
                     $newTag->{'set' . $propertyName}($reflectionTag->{'get' . $propertyName}());
                 }
-            } elseif (0 === strpos($method->getName(), 'is')) {
+            } elseif (str_starts_with($method->getName(), 'is')) {
                 $propertyName = ucfirst($method->getName());
                 if (method_exists($newTag, 'set' . $propertyName)) {
                     $newTag->{'set' . $propertyName}($reflectionTag->{$method->getName()}());

src/Generator/TraitUsageGenerator.php

@@ -16,6 +16,7 @@
 use function is_array;
 use function is_string;
 use function sprintf;
+use function str_contains;
 use function strpos;
 
 /** @psalm-type Visibility = ReflectionMethod::IS_PRIVATE|ReflectionMethod::IS_PROTECTED|ReflectionMethod::IS_PUBLIC */
@@ -254,7 +255,7 @@ public function addTraitAlias($method, $alias, $visibility = null)
         }
 
         // Validations
-        if (false === strpos($traitAndMethod, '::')) {
+        if (! str_contains($traitAndMethod, '::')) {
             throw new Exception\InvalidArgumentException(
                 'Invalid Format: $method must be in the format of trait::method'
             );
@@ -321,7 +322,7 @@ public function addTraitOverride($method, $traitsToReplace)
         }
 
         // Validations
-        if (false === strpos($traitAndMethod, '::')) {
+        if (! str_contains($traitAndMethod, '::')) {
             throw new Exception\InvalidArgumentException(
                 'Invalid Format: $method must be in the format of trait::method'
             );

src/Generator/TypeGenerator.php

@@ -18,6 +18,8 @@
 use function explode;
 use function implode;
 use function sprintf;
+use function str_contains;
+use function str_starts_with;
 use function strpos;
 use function strtolower;
 use function substr;
@@ -106,7 +108,7 @@ public static function fromTypeString(string $type): self
         $isIntersection = false;
         $separator      = '|';
 
-        if (false !== strpos($type, '&')) {
+        if (str_contains($type, '&')) {
             $isIntersection = true;
             $separator      = '&';
         }
@@ -210,7 +212,7 @@ public function __toString(): string
      */
     private static function trimNullable($type): array
     {
-        if (0 === strpos($type, '?')) {
+        if (str_starts_with($type, '?')) {
             return [true, substr($type, 1)];
         }
 

src/Generator/ValueGenerator.php

@@ -21,6 +21,7 @@
 use function is_object;
 use function max;
 use function sprintf;
+use function str_contains;
 use function str_repeat;
 use function strpos;
 
@@ -311,7 +312,7 @@ public function getAutoDeterminedType($value)
                         return self::TYPE_CONSTANT;
                     }
 
-                    if (strpos($value, $constant) !== false) {
+                    if (str_contains($value, $constant)) {
                         return self::TYPE_CONSTANT;
                     }
                 }

test/Generator/TypeGeneratorTest.php

@@ -13,6 +13,7 @@
 use function class_implements;
 use function ltrim;
 use function str_replace;
+use function str_starts_with;
 use function strpos;
 
 /**
@@ -241,7 +242,7 @@ public function validClassName()
     {
         return array_filter(
             $this->validType(),
-            static fn(array $pair) => 0 === strpos($pair[1], '\\')
+            static fn(array $pair) => str_starts_with($pair[1], '\\')
         );
     }