Code cleanup and delete returns true on any 200 status

Author: phpfui

.php-cs-fixer.dist.php

@@ -11,6 +11,6 @@
 return $config->setFinder(PhpCsFixer\Finder::create()
 			->exclude('vendor')
 			->in(__DIR__.'\src')
-			->in(__DIR__.'\Tools')
+			->in(__DIR__.'\Tool')
 			->in(__DIR__.'\tests')
     );

Tests/CustomFieldTest.php

@@ -76,5 +76,4 @@ public function testMaxLength() : void
 		$this->expectException(\PHPFUI\ConstantContact\Exception\InvalidLength::class);
 		$fixture->cf_string = \str_pad('', 300);
 		}
-
 	}

Tests/DefinitionTest.php

@@ -256,5 +256,4 @@ public function testClassArraySizeMin() : void
 		$this->assertIsArray($fixture->classArraySizeMin);
 		$this->assertCount(2, $fixture->classArraySizeMin);
 		}
-
 	}

Tool/Generator.php

@@ -80,9 +80,9 @@ public function makeDefinitions(array $definitions) : void
 
 	public function generateDefinition(string $namespacedClass, array $properties) : void
 		{
-		$parts = explode('\\', $namespacedClass);
-		$class = array_pop($parts);
-		$namespace = implode('\\', $parts);
+		$parts = \explode('\\', $namespacedClass);
+		$class = \array_pop($parts);
+		$namespace = \implode('\\', $parts);
 		$originalType = '';
 
 		if (! isset($properties['type']))
@@ -180,6 +180,7 @@ public function generateDefinition(string $namespacedClass, array $properties) :
 					}
 
 				$description = '';
+
 				if (isset($details['description']))
 					{
 					$description = $this->cleanDescription(\trim($details['description']));
@@ -190,7 +191,7 @@ public function generateDefinition(string $namespacedClass, array $properties) :
 					$type = $originalType;
 					}
 				$type = \str_replace('\\\\', '\\', $type);
-				$docBlock[] = trim("{$type} {$dollar}{$name} {$description}");
+				$docBlock[] = \trim("{$type} {$dollar}{$name} {$description}");
 				}
 			$this->generateFromTemplate($class, ['fields' => $fields, 'minLength' => $minLength, 'maxLength' => $maxLength, ], $docBlock);
 			}
@@ -203,8 +204,9 @@ public function generateDefinition(string $namespacedClass, array $properties) :
 	 */
 	private function getUniqueClassName(string $namespace, string $class) : string
 		{
-		$namespace = trim($namespace, '\\');
+		$namespace = \trim($namespace, '\\');
 		$class = $this->getClassName($class);
+
 		if (isset($this->duplicateClasses[$class]))
 			{
 			$class = $this->duplicateClasses[$class];
@@ -217,7 +219,7 @@ private function getUniqueClassName(string $namespace, string $class) : string
 		$fullName = '\\' . $namespace . '\\' . $class;
 
 		// if we have seen this class before, then it is the plural version and it should be singular because CC does not know how to design an API (among other things).
-		if (! str_contains($fullName, 'Definition') && isset($this->generatedClasses[$fullName]))
+		if (! \str_contains($fullName, 'Definition') && isset($this->generatedClasses[$fullName]))
 			{
 			if (\str_ends_with($class, 'ies'))
 				{
@@ -238,9 +240,9 @@ private function getUniqueClassName(string $namespace, string $class) : string
 
 	private function writeClass(string $namespacedClass, string $apiPath, array $properties) : void
 		{
-		$parts = explode('\\', $namespacedClass);
-		$class = array_pop($parts);
-		$namespace = trim(implode('\\', $parts), '\\');
+		$parts = \explode('\\', $namespacedClass);
+		$class = \array_pop($parts);
+		$namespace = \trim(\implode('\\', $parts), '\\');
 
 		$methods = '';
 		$dollar = '$';
@@ -499,7 +501,7 @@ private function formatDescription(string $description) : string
 	 */
 	private function generateFromTemplate(string $name, array $properties, array $docBlocks) : void
 		{
-		$namespace = trim($this->definitionNamespace, '\\');
+		$namespace = \trim($this->definitionNamespace, '\\');
 
 		$template = <<<PHP
 <?php
@@ -588,21 +590,21 @@ private function deleteFileTree(string $path) : void
 		$directory = __DIR__ . '/../src/ConstantContact' . $path;
 
 		$iterator = new \RecursiveIteratorIterator(
-				new \RecursiveDirectoryIterator($directory, \RecursiveDirectoryIterator::SKIP_DOTS),
-				\RecursiveIteratorIterator::SELF_FIRST);
+			new \RecursiveDirectoryIterator($directory, \RecursiveDirectoryIterator::SKIP_DOTS),
+			\RecursiveIteratorIterator::SELF_FIRST
+		);
 
 		foreach ($iterator as $item)
 			{
 			if (! $item->isDir())
 				{
 				$fileName = "{$item}";
 				// don't delete base classes
-				if (! str_ends_with($fileName, 'Base.php'))
+				if (! \str_ends_with($fileName, 'Base.php'))
 					{
-					unlink($fileName);
+					\unlink($fileName);
 					}
 				}
 			}
 		}
-
 	}

src/ConstantContact/Client.php

@@ -57,8 +57,6 @@ public function __construct(private string $clientAPIKey, private string $client
 	 *
 	 * Callback function signature:
 	 *
-	 * @param string $key used to store or retrieve $value
-	 * @param ?string $value if null, value should be returned and key deleted, if not null, value should be stored by key.
 	 * @return string $value from store or value passed in on set (ignored)
 	 */
 	public function setSessionCallback(callable $callback) : self
@@ -310,7 +308,7 @@ public function delete(string $url) : bool
 
 			$this->process($response);
 
-			return 204 == $this->statusCode;
+			return $this->statusCode >= 200 && $this->statusCode < 300;
 			}
 		catch (\GuzzleHttp\Exception\RequestException $e)
 			{
@@ -491,8 +489,9 @@ private function session(string $key, ?string $value) : string
 		{
 		if ($this->sessionCallback)
 			{
-			return call_user_func($this->sessionCallback, $key, $value);
+			return \call_user_func($this->sessionCallback, $key, $value);
 			}
+
 		if (null === $value)
 			{
 			$value = $_SESSION[$key];

src/ConstantContact/Definition/Base.php

@@ -54,11 +54,13 @@ public function __construct(array $initialValues = [])
 		foreach ($initialValues as $field => $value)
 			{
 			$actualField = $field;
-			if (str_starts_with($field, 'cf_'))
+
+			if (\str_starts_with($field, 'cf_'))
 				{
 				$field = 'cf:custom_field_name';
 				}
 			$type = static::$fields[$field] ?? null;
+
 			if (! $type)
 				{
 				continue;
@@ -88,10 +90,12 @@ public function __construct(array $initialValues = [])
 	public function __get(string $field) : mixed
 		{
 		$actualField = $field;
-		if (str_starts_with($field, 'cf_'))
+
+		if (\str_starts_with($field, 'cf_'))
 			{
 			$field = 'cf:custom_field_name';
 			}
+
 		if (! isset(static::$fields[$field]))
 			{
 			throw new \PHPFUI\ConstantContact\Exception\InvalidField(static::class . "::{$actualField} is not a valid field");
@@ -108,7 +112,8 @@ public function __get(string $field) : mixed
 	public function __set(string $field, $value)
 		{
 		$actualField = $field;
-		if (str_starts_with($field, 'cf_'))
+
+		if (\str_starts_with($field, 'cf_'))
 			{
 			$field = 'cf:custom_field_name';
 			}
@@ -267,7 +272,7 @@ public function getData() : array
 					}
 				else
 					{
-					$result[str_replace('cf_', 'cf:', $field)] = \is_object($value) ? (string)$value : $value;
+					$result[\str_replace('cf_', 'cf:', $field)] = \is_object($value) ? (string)$value : $value;
 					}
 				}
 			}