Fix task

Author: dereuromark

composer.json

@@ -23,7 +23,7 @@
 	},
 	"require": {
 		"php": ">=7.2",
-		"dereuromark/cakephp-ide-helper": "^1.2.0"
+		"dereuromark/cakephp-ide-helper": "^1.3.0"
 	},
 	"require-dev": {
 		"dereuromark/cakephp-tools": "^2.0.1",

src/Tools/Generator/Task/FormatIconFontAwesome4Task.php

@@ -7,6 +7,7 @@
 use Cake\View\View;
 use IdeHelper\Generator\Directive\ExpectedArguments;
 use IdeHelper\Generator\Task\TaskInterface;
+use RuntimeException;
 use Tools\View\Helper\FormatHelper;
 
 /**
@@ -28,6 +29,9 @@ public function __construct(?string $fontPath = null) {
 		if ($fontPath === null) {
 			$fontPath = (string)Configure::readOrFail('Format.fontPath');
 		}
+		if ($fontPath && !file_exists($fontPath)) {
+			throw new RuntimeException('File not found: ' . $fontPath);
+		}
 
 		$this->fontPath = $fontPath;
 	}
@@ -54,28 +58,35 @@ public function collect(): array {
 	}
 
 	/**
-	 * Fontawesome v4 using fontawesome-webfont.svg file.
+	 * Fontawesome v4 using variables.scss or variables.less file.
 	 *
 	 * Set your custom file path in your app.php:
-	 *     'fontPath' => ROOT . '/webroot/css/fonts/fontawesome-webfont.svg'
+	 *     'fontPath' => ROOT . '/node_modules/.../scss/variables.scss'
 	 *
 	 * @return string[]
 	 */
 	protected function collectIcons(): array {
 		$helper = new FormatHelper(new View());
 		$configured = $helper->getConfig('fontIcons');
+		$configured = array_keys($configured);
 
 		$fontFile = $this->fontPath;
 		$icons = [];
 		if ($fontFile && file_exists($fontFile)) {
 			$content = file_get_contents($fontFile);
-			preg_match_all('/glyph-name="([a-z][^"]+)"/', $content, $matches);
-			$icons = $matches[1];
-			foreach ($icons as $key => $icon) {
-				if (strpos($icon, 'uni') === 0 || preg_match('#[a-z]\d[a-z]\d#i', $icon)) {
-					unset($icons[$key]);
-				}
+			$ext = pathinfo($fontFile, PATHINFO_EXTENSION);
+			switch ($ext) {
+				case 'less':
+					preg_match_all('/@fa-var-([0-9a-z-]+):/', $content, $matches);
+					break;
+				case 'scss':
+					preg_match_all('/\$fa-var-([0-9a-z-]+):/', $content, $matches);
+					break;
+				default:
+					throw new RuntimeException('Format not supported: ' . $ext);
 			}
+
+			$icons = !empty($matches[1]) ? $matches[1] : [];
 		}
 
 		$icons = array_merge($configured, $icons);

src/Tools/Generator/Task/FormatIconFontAwesome5Task.php

@@ -7,6 +7,7 @@
 use Cake\View\View;
 use IdeHelper\Generator\Directive\ExpectedArguments;
 use IdeHelper\Generator\Task\TaskInterface;
+use RuntimeException;
 use Tools\View\Helper\FormatHelper;
 
 class FormatIconFontAwesome5Task implements TaskInterface {
@@ -25,6 +26,9 @@ public function __construct(?string $fontPath = null) {
 		if ($fontPath === null) {
 			$fontPath = (string)Configure::readOrFail('Format.fontPath');
 		}
+		if ($fontPath && !file_exists($fontPath)) {
+			throw new RuntimeException('File not found: ' . $fontPath);
+		}
 
 		$this->fontPath = $fontPath;
 	}
@@ -62,6 +66,7 @@ public function collect(): array {
 	protected function collectIcons(): array {
 		$helper = new FormatHelper(new View());
 		$configured = $helper->getConfig('fontIcons');
+		$configured = array_keys($configured);
 
 		$fontFile = $this->fontPath;
 		$icons = [];

tests/TestCase/Tools/Generator/Task/FormatIconFontAwesome4TaskTest.php

@@ -35,10 +35,14 @@ public function testIcon(): void {
 	}
 
 	/**
+	 * @dataProvider extensions
+	 *
+	 * @param string $extension
+	 *
 	 * @return void
 	 */
-	public function testCollect(): void {
-		$path = TEST_FILES . 'Tools' . DS . 'fa4' . DS . 'fontawesome-webfont.svg';
+	public function testCollect(string $extension): void {
+		$path = TEST_FILES . 'Tools' . DS . 'fa4' . DS . 'variables.' . $extension;
 		$task = new FormatIconFontAwesome4Task($path);
 
 		$result = $task->collect();
@@ -55,8 +59,18 @@ public function testCollect(): void {
 			return (string)$className;
 		}, $list);
 
-		$this->assertTrue(count($list) > 380);
-		$this->assertSame('\'smile\'', $list['smile']);
+		$this->assertTrue(count($list) > 780, 'count of ' . count($list));
+		$this->assertSame('\'smile-o\'', $list['smile-o']);
+	}
+
+	/**
+	 * @return array
+	 */
+	public function extensions(): array {
+		return [
+			'scss' => ['scss'],
+			'less' => ['less'],
+		];
 	}
 
 }