Class ordering from PHPCSFixer

Author: phpfui

composer.json

@@ -25,7 +25,7 @@
 				"psr-4": {"PHPFUI\\InstaDoc\\": "src/PHPFUI/InstaDoc/"}
 		},
 		"require-dev": {
-				"phpunit/phpunit": "<10.0",
+				"phpunit/phpunit": "<11.0",
 				"phpfui/html-unit-tester": "^1.0",
 				"roave/security-advisories": "dev-latest",
 				"phpfui/phpunit-syntax-coverage": "^1.0",

src/PHPFUI/InstaDoc/Controller.php

@@ -313,6 +313,34 @@ public function getClassUrl(string $namespacedClass) : string
 		return $url;
 		}
 
+	/**
+	 * Get parameters for the class and method
+	 */
+	public function getConstructorParameters(string $className) : string
+		{
+		try
+			{
+			$reflection = new \ReflectionClass($className);
+			}
+		catch (\Exception)
+			{
+			return '';
+			}
+
+		$methodName = '__construct';
+
+		if (! $reflection->hasMethod($methodName))
+			{
+			return '';
+			}
+
+		$method = $reflection->getMethod($methodName);
+		$section = new \PHPFUI\InstaDoc\Section\CodeCommon($this, $className);
+		$parameters = $section->getMethodParameters($method);
+
+		return \Soundasleep\Html2Text::convert($parameters, ['drop_links' => true, 'ignore_errors' => true]);
+		}
+
 	/**
 	 * Returns the current page for the controller that will be used to display the documentation.
 	 */
@@ -461,34 +489,6 @@ public function getParameters() : array
 		return $this->parameters;
 		}
 
-	/**
-	 * Get parameters for the class and method
-	 */
-	public function getConstructorParameters(string $className) : string
-		{
-		try
-			{
-			$reflection = new \ReflectionClass($className);
-			}
-		catch (\Exception)
-			{
-			return '';
-			}
-
-		$methodName = '__construct';
-
-		if (! $reflection->hasMethod($methodName))
-			{
-			return '';
-			}
-
-		$method = $reflection->getMethod($methodName);
-		$section = new \PHPFUI\InstaDoc\Section\CodeCommon($this, $className);
-		$parameters = $section->getMethodParameters($method);
-
-		return \Soundasleep\Html2Text::convert($parameters, ['drop_links' => true, 'ignore_errors' => true]);
-		}
-
 	/**
 	 * Get a section for display. Override to change layout
 	 */

src/PHPFUI/InstaDoc/FileManager.php

@@ -8,15 +8,15 @@ class FileManager
 
 	private string $configFile = '..';
 
-	private string $extension = '.serial';
-
-	private string $fileName = '';
-
 	/**
 	 * @var array<string>
 	 */
 	private array $excludedNamespaces = [];
 
+	private string $extension = '.serial';
+
+	private string $fileName = '';
+
 	/**
 	 * @var array<array<string>>
 	 */
@@ -36,21 +36,6 @@ public function __construct(string $composerJsonPath = '')
 		$this->fileName = \substr($class, \strrpos($class, '\\') + 1);
 		}
 
-	/**
-	 * You can add a Namespace directly.  Specify the namespace (no
-	 * leading backslash) and the directory containing the class
-	 * files. This is realitive to the current script directory.
-	 * You can also pass an option localGit flag indicating this
-	 * directory is in the project git repo.  This will allow you to
-	 * see the git history on the file.
-	 */
-	public function addNamespace(string $namespace, string $directory, bool $localGit = false) : FileManager
-		{
-		$this->includedNamespaces[] = [$namespace, $directory, $localGit];
-
-		return $this;
-		}
-
 	/**
 	 * The classes in the global namespace are handled slightly
 	 * differently, as this should be the exception rather than the
@@ -67,21 +52,16 @@ public function addGlobalNameSpaceClass(string $filename, bool $localGit = false
 		}
 
 	/**
-	 * Set file extension for saving index file
-	 */
-	public function setExtension(string $extension = '.serial') : self
-		{
-		$this->extension = $extension;
-
-		return $this;
-		}
-
-	/**
-	 * Set base file name for saving index file
+	 * You can add a Namespace directly.  Specify the namespace (no
+	 * leading backslash) and the directory containing the class
+	 * files. This is realitive to the current script directory.
+	 * You can also pass an option localGit flag indicating this
+	 * directory is in the project git repo.  This will allow you to
+	 * see the git history on the file.
 	 */
-	public function setBaseFile(string $fileName) : self
+	public function addNamespace(string $namespace, string $directory, bool $localGit = false) : FileManager
 		{
-		$this->fileName = $fileName;
+		$this->includedNamespaces[] = [$namespace, $directory, $localGit];
 
 		return $this;
 		}
@@ -177,6 +157,16 @@ public function save(string $fileName = '') : bool
 		return \PHPFUI\InstaDoc\NamespaceTree::save($this->getSerializedName($fileName));
 		}
 
+	/**
+	 * Set base file name for saving index file
+	 */
+	public function setBaseFile(string $fileName) : self
+		{
+		$this->fileName = $fileName;
+
+		return $this;
+		}
+
 	public function setComposerPath(string $composerJsonPath) : FileManager
 		{
 		$this->composerJsonPath = \str_replace('\\', '/', $composerJsonPath);
@@ -196,6 +186,16 @@ public function setConfigName(string $dirOrFilename) : FileManager
 		return $this;
 		}
 
+	/**
+	 * Set file extension for saving index file
+	 */
+	public function setExtension(string $extension = '.serial') : self
+		{
+		$this->extension = $extension;
+
+		return $this;
+		}
+
 	private function getSerializedName(string $fileName = '', string $extension = '') : string
 		{
 		$file = $this->configFile;

src/PHPFUI/InstaDoc/MarkDownParser.php

@@ -16,7 +16,7 @@ public function __construct()
 
 	public function fileText(string $filename) : string
 		{
-		$markdown = @\file_get_contents($filename);
+		$markdown = \file_exists($filename) ? \file_get_contents($filename) : '';
 
 		return $this->text($markdown);
 		}

src/PHPFUI/InstaDoc/PageInterface.php

@@ -12,9 +12,9 @@ public function addBody(mixed $item) : PageInterface;
 
 	public function create(\PHPFUI\Menu $menu) : void;
 
+	public static function setDebug(int $level = 0) : void;
+
 	public function setGenerating(string $generating) : PageInterface;
 
 	public function setHomeUrl(string $url) : PageInterface;
-
-	public static function setDebug(int $level = 0) : void;
 	}