Reorganize namespace and file autoloader (#24)

app/CaseConverter/CaseConverter.php → app/Str/CaseConverter/CaseConverter.php

@@ -2,11 +2,12 @@
 
 declare(strict_types=1);
 
-namespace Syntatis\Utils\CaseConverter;
+namespace Syntatis\Utils\Str\CaseConverter;
 
 use Jawira\CaseConverter\CaseConverter as CaseConverterFactory;
 
-class CaseConverter
+/** @internal */
+final class CaseConverter
 {
 	private static ?CaseConverterFactory $instance = null;
 

app/CaseConverter/functions.php → app/Str/CaseConverter/functions.php

@@ -4,7 +4,7 @@
 
 namespace Syntatis\Utils;
 
-use Syntatis\Utils\CaseConverter\CaseConverter;
+use Syntatis\Utils\Str\CaseConverter\CaseConverter;
 
 /**
  * Convert a string to "camelCase" format.

app/Str/Inflector/Inflector.php

@@ -0,0 +1,23 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Syntatis\Utils\Str\Inflector;
+
+use Doctrine\Inflector\Inflector as DoctrineInflector;
+use Doctrine\Inflector\InflectorFactory;
+
+/** @internal */
+final class Inflector
+{
+	private static ?DoctrineInflector $instance = null;
+
+	public static function instance(): DoctrineInflector
+	{
+		if (self::$instance === null) {
+			self::$instance = InflectorFactory::create()->build();
+		}
+
+		return self::$instance;
+	}
+}

app/Inflector/functions.php → app/Str/Inflector/functions.php

@@ -4,7 +4,7 @@
 
 namespace Syntatis\Utils;
 
-use Syntatis\Utils\Inflector\Inflector;
+use Syntatis\Utils\Str\Inflector\Inflector;
 
 /**
  * Convert a string (word) to its singular form.

app/Validator/Validator.php

@@ -7,7 +7,8 @@
 use Symfony\Component\Validator\Validation;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
 
-class Validator
+/** @internal */
+final class Validator
 {
 	private static ?ValidatorInterface $instance = null;
 

app/functions.php

@@ -0,0 +1,7 @@
+<?php
+
+declare(strict_types=1);
+
+require_once __DIR__ . '/Str/CaseConverter/functions.php';
+require_once __DIR__ . '/Str/Inflector/functions.php';
+require_once __DIR__ . '/Validator/functions.php';

codecov.yml

@@ -1,3 +1,5 @@
 comment:
   layout: "condensed_header, condensed_files, condensed_footer"
   hide_project_coverage: true
+ignore:
+  - "app/functions.php"

composer.json

@@ -30,19 +30,15 @@
 	"prefer-stable": true,
 	"autoload": {
 		"files": [
-			"app/CaseConverter/functions.php",
-			"app/Inflector/functions.php",
-			"app/Validator/functions.php"
+			"app/functions.php"
 		],
 		"psr-4": {
 			"Syntatis\\Utils\\": "app"
 		}
 	},
 	"autoload-dev": {
 		"files": [
-			"app/CaseConverter/functions.php",
-			"app/Inflector/functions.php",
-			"app/Validator/functions.php"
+			"app/functions.php"
 		],
 		"psr-4": {
 			"Syntatis\\Utils\\Tests\\": "tests"

tests/CaseConverterTest.php → tests/Str/CaseConverterTest.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Syntatis\Utils\Tests;
+namespace Syntatis\Utils\Tests\Str;
 
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\TestDox;

tests/InflectorTest.php → tests/Str/InflectorTest.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Syntatis\Utils\Tests;
+namespace Syntatis\Utils\Tests\Str;
 
 use PHPUnit\Framework\TestCase;