From 10d7f7de1af7ec4140db28f35852ecea38a36ef8 Mon Sep 17 00:00:00 2001 From: Nik Samokhvalov Date: Tue, 12 Jan 2021 10:01:06 +0300 Subject: [PATCH] Revert "Add installer for TastyIgniter extensions and themes (#474)" (#476) This reverts commit 0d9bf4fa70d0ef9d62a8f5681f9d747fc97194b1. --- README.md | 1 - composer.json | 1 - src/Composer/Installers/IgniterInstaller.php | 32 ------- src/Composer/Installers/Installer.php | 1 - .../Installers/Test/IgniterInstallerTest.php | 90 ------------------- .../Installers/Test/InstallerTest.php | 4 - 6 files changed, 129 deletions(-) delete mode 100644 src/Composer/Installers/IgniterInstaller.php delete mode 100644 tests/Composer/Installers/Test/IgniterInstallerTest.php diff --git a/README.md b/README.md index 2e441f91..2e75c2c6 100644 --- a/README.md +++ b/README.md @@ -113,7 +113,6 @@ is not needed to install packages with these frameworks: | Sylius | `sylius-theme` | symfony1 | **`symfony1-plugin`** | TAO | `tao-extension` -| TastyIgniter | **`igniter-extension`
`igniter-theme`** | Tusk | `tusk-task`
`tusk-command`
`tusk-asset` | TYPO3 Flow | `typo3-flow-package`
`typo3-flow-framework`
`typo3-flow-plugin`
`typo3-flow-site`
`typo3-flow-boilerplate`
`typo3-flow-build` | TYPO3 CMS | `typo3-cms-extension` (Deprecated in this package, use the [TYPO3 CMS Installers](https://packagist.org/packages/typo3/cms-composer-installers) instead) diff --git a/composer.json b/composer.json index 48e71553..61c0b7f4 100644 --- a/composer.json +++ b/composer.json @@ -68,7 +68,6 @@ "SyDES", "Sylius", "symfony", - "TastyIgniter", "Thelia", "TYPO3", "WHMCS", diff --git a/src/Composer/Installers/IgniterInstaller.php b/src/Composer/Installers/IgniterInstaller.php deleted file mode 100644 index 82516c78..00000000 --- a/src/Composer/Installers/IgniterInstaller.php +++ /dev/null @@ -1,32 +0,0 @@ - 'extensions/{$vendor}/{$name}/', - 'theme' => 'themes/{$name}/', - ); - - /** - * Format package name. - * - * Cut off leading 'ti-ext-' or 'ti-theme-' if present. - * Strip vendor name of characters that is not alphanumeric or an underscore - * - */ - public function inflectPackageVars($vars) - { - if ($vars['type'] === 'igniter-extension') { - $vars['vendor'] = preg_replace('/[^a-z0-9_]/i', '', $vars['vendor']); - $vars['name'] = preg_replace('/^ti-ext-$/', '', $vars['name']); - } - - if ($vars['type'] === 'igniter-theme') { - $vars['name'] = preg_replace('/^ti-theme-$/', '', $vars['name']); - } - - return $vars; - } -} \ No newline at end of file diff --git a/src/Composer/Installers/Installer.php b/src/Composer/Installers/Installer.php index 59f7df8f..5869c177 100644 --- a/src/Composer/Installers/Installer.php +++ b/src/Composer/Installers/Installer.php @@ -50,7 +50,6 @@ class Installer extends LibraryInstaller 'fuelphp' => 'FuelphpInstaller', 'grav' => 'GravInstaller', 'hurad' => 'HuradInstaller', - 'igniter' => 'IgniterInstaller', 'imagecms' => 'ImageCMSInstaller', 'itop' => 'ItopInstaller', 'joomla' => 'JoomlaInstaller', diff --git a/tests/Composer/Installers/Test/IgniterInstallerTest.php b/tests/Composer/Installers/Test/IgniterInstallerTest.php deleted file mode 100644 index 264a78a0..00000000 --- a/tests/Composer/Installers/Test/IgniterInstallerTest.php +++ /dev/null @@ -1,90 +0,0 @@ -installer = new IgniterInstaller( - new Package('NyanCat', '4.2', '4.2'), - new Composer() - ); - } - - /** - * @dataProvider packageNameInflectionProvider - * - * @return void - */ - public function testInflectPackageVars($type, $vendor, $name, $expectedVendor, $expectedName) - { - $this->assertEquals( - $this->installer->inflectPackageVars(array( - 'vendor' => $vendor, - 'name' => $name, - 'type' => $type, - )), - array('vendor' => $expectedVendor, 'name' => $expectedName, 'type' => $type) - ); - } - - public function packageNameInflectionProvider() - { - return array( - array( - 'igniter-extension', - 'acme', - 'pages', - 'acme', - 'pages', - ), - array( - 'igniter-extension', - 'acme', - 'ti-ext-pages', - 'acme', - 'pages', - ), - // tests vendor name containing a hyphen - array( - 'igniter-extension', - 'foo-bar-co', - 'blog', - 'foobarco', - 'blog', - ), - // tests that exactly one '-theme' is cut off - array( - 'igniter-theme', - 'acme', - 'ti-theme-theme', - 'acme', - 'theme', - ), - // tests that names without '-theme' suffix stay valid - array( - 'igniter-theme', - 'acme', - 'someothertheme', - 'acme', - 'someothertheme', - ), - ); - } -} diff --git a/tests/Composer/Installers/Test/InstallerTest.php b/tests/Composer/Installers/Test/InstallerTest.php index 316a55ca..59ae5320 100644 --- a/tests/Composer/Installers/Test/InstallerTest.php +++ b/tests/Composer/Installers/Test/InstallerTest.php @@ -149,8 +149,6 @@ public function dataForTestSupport() array('fuelphp-component', true), array('hurad-plugin', true), array('hurad-theme', true), - array('igniter-extension', true), - array('igniter-theme', true), array('imagecms-template', true), array('imagecms-module', true), array('imagecms-library', true), @@ -346,8 +344,6 @@ public function dataForTestInstallPath() array('fuelphp-component', 'components/demo/', 'fuelphp/demo'), array('hurad-plugin', 'plugins/Akismet/', 'atkrad/akismet'), array('hurad-theme', 'plugins/Hurad2013/', 'atkrad/Hurad2013'), - array('igniter-extension', 'extensions/shama/my_extension/', 'shama/my_extension'), - array('igniter-theme', 'themes/my_theme/', 'shama/my_theme'), array('imagecms-template', 'templates/my_template/', 'shama/my_template'), array('imagecms-module', 'application/modules/my_module/', 'shama/my_module'), array('imagecms-library', 'application/libraries/my_library/', 'shama/my_library'),