Fixed service provider command

Author: CrochetFeve0251

inc/App.php

@@ -3,6 +3,7 @@
 namespace RocketLauncherBuilder;
 
 use Ahc\Cli\Application;
+use Ahc\Cli\Helper\Shell;
 
 class App extends Application
 {
@@ -35,4 +36,18 @@ public function launchCommand(string $command_class, array $params = []) {
 
  $this->doAction($command_instance);
  }
+
+ /**
+ * Launch a shell command.
+ *
+ * @param string $command command to launch.
+ * @param string|null $directory directory to exec
+ * @param array $env
+ * @param float $timeout
+ * @return Shell
+ */
+ public function launchShell(string $command, string $directory = null, array $env = [], float $timeout = 10.5) {
+ $shell = new Shell($command);
+ return $shell->setOptions($directory, $env, $timeout)->execute();
+ }
 }

inc/Commands/GenerateServiceProvider.php

@@ -6,12 +6,15 @@
 use League\Flysystem\Filesystem;
 use RocketLauncherBuilder\Entities\Configurations;
 use RocketLauncherBuilder\Services\ClassGenerator;
+use RocketLauncherBuilder\Services\ProjectManager;
 
 /**
  * @property string|null $name Name from the service provider.
  */
 class GenerateServiceProvider extends Command
 {
+ CONST PROVIDER_CONFIGS = 'configs/providers.php';
+
  /**
  * Class generator.
  *
@@ -33,28 +36,39 @@ class GenerateServiceProvider extends Command
  */
  protected $configurations;
 
+ /**
+ * @var ProjectManager
+ */
+ protected $project_manager;
+
  /**
  * Instantiate the class.
  *
  * @param ClassGenerator $class_generator Class generator.
  * @param Filesystem $filesystem Interacts with the filesystem.
  * @param Configurations $configurations Configuration from the project.
  */
- public function __construct(ClassGenerator $class_generator, Filesystem $filesystem, Configurations $configurations)
+ public function __construct(ClassGenerator $class_generator, Filesystem $filesystem, Configurations $configurations, ProjectManager $project_manager)
  {
  parent::__construct('provider', 'Generate service provider class');
 
  $this->filesystem = $filesystem;
  $this->configurations = $configurations;
  $this->class_generator = $class_generator;
+ $this->project_manager = $project_manager;
 
  $this
  ->argument('[name]', 'Full name from the service provider')
+
  // Usage examples:
  ->usage(
  // append details or explanation of given example with ` ## ` so they will be uniformly aligned when shown
  '<bold> $0 provider</end> <comment>MyClass</end> ## Creates the service provider<eol/>'
  );
+
+ if($this->project_manager->is_resolver_present()) {
+ $this->option('-t --type', 'Type from the provider');
+ }
  }
 
  /**
@@ -77,11 +91,13 @@ public function interact(Interactor $io)
  * @return void
  * @throws \League\Flysystem\FileNotFoundException
  */
- public function execute($name)
+ public function execute($name, $type)
  {
  $io = $this->app()->io();
 
- $path = $this->class_generator->generate('serviceprovider.php.tpl', $name );
+ $is_resolver = $type === 'autoresolver' || $type === 'a';
+
+ $path = $this->class_generator->generate( $is_resolver ? 'serviceprovider/autoresolver.php.tpl' : 'serviceprovider/vanilla.php.tpl', $name );
 
  if( ! $path ) {
  $io->write("The class already exists", true);
@@ -90,12 +106,18 @@ public function execute($name)
 
  $io->write("The service provider is created at this path: $path", true);
 
+ $this->add_provider_to_plugin($name);
+
+ $this->add_provider_to_configs($name);
+ }
+
+ protected function add_provider_to_plugin(string $class) {
  $plugin_path = $this->configurations->getCodeDir() . 'Plugin.php';
 
  $plugin_content = $this->filesystem->read($plugin_path);
 
-  preg_match('/\$providers = \[(?<content>[^]]*)];/', $plugin_content, $content);
- $content = $content['content'] . " " . $this->class_generator->get_fullname($name) . "::class,\n";
+ preg_match('/\$providers = \[(?<content>[^]]*)];/', $plugin_content, $content);
+ $content = $content['content'] . " " . $this->class_generator->get_fullname($class) . "::class,\n";
  $plugin_content = preg_replace('/\$providers = \[(?<content>[^\]])*];/', "\$providers = [$content ];", $plugin_content);
 
  if(! $plugin_content) {
@@ -104,4 +126,22 @@ public function execute($name)
 
  $this->filesystem->update($plugin_path, $plugin_content);
  }
+
+ protected function add_provider_to_configs(string $class) {
+ if(! $this->filesystem->has(self::PROVIDER_CONFIGS)) {
+ return;
+ }
+ $content = $this->filesystem->read(self::PROVIDER_CONFIGS);
+
+ if(! preg_match('/(?<array>return\s\[(?:[^[\]]+|(?R))*\]\s*;\s*$)/', $content, $results)) {
+ return;
+ }
+
+ $new_content = " {$this->class_generator->get_fullname($class)}::class,\n";
+ $new_content .= "];\n";
+
+ $content = preg_replace('/\n\h*]\s*;\s*$/', $new_content, $content);
+
+ $this->filesystem->update(self::PROVIDER_CONFIGS, $content);
+ }
 }

inc/ServiceProviders/BaseServiceProvider.php

@@ -83,21 +83,21 @@ public function __construct(Configurations $configs, Filesystem $filesystem, str
  */
  public function attach_commands(App $app): App
  {
+ $project_manager = new ProjectManager($this->filesystem);
+
  $class_generator = new ClassGenerator($this->filesystem, $this->renderer, $this->configs);
- $provider_manager = new ProviderManager($app, $this->filesystem, $class_generator, $this->renderer);
+ $provider_manager = new ProviderManager($app, $this->filesystem, $class_generator, $this->renderer, $project_manager);
 
  $setup_generator = new SetUpGenerator($this->filesystem, $this->renderer, $this->configs);
 
  $fixture_generator = new FixtureGenerator($this->filesystem, $this->renderer);
 
  $content_generator = new ContentGenerator($this->filesystem, $this->renderer);
 
- $project_manager = new ProjectManager($this->filesystem);
-
  $bootstrap_manager = new BootstrapManager($this->filesystem, $this->configs, $this->renderer);
 
  $app->add(new GenerateSubscriberCommand($class_generator, $this->filesystem, $provider_manager));
- $app->add(new GenerateServiceProvider($class_generator, $this->filesystem, $this->configs));
+ $app->add(new GenerateServiceProvider($class_generator, $this->filesystem, $this->configs, $project_manager));
  $app->add(new GenerateTableCommand($class_generator, $this->configs, $provider_manager));
  $app->add(new GenerateTestsCommand($class_generator, $this->configs, $this->filesystem, $setup_generator, $fixture_generator, $content_generator, $bootstrap_manager, $project_manager));
  $app->add(new GenerateFixtureCommand($class_generator, $this->filesystem, $this->configs));

inc/Services/ProjectManager.php

@@ -66,6 +66,17 @@ public function add_external_test_group(string $group) {
  return true;
  }
 
+ public function is_resolver_present() {
+ if( ! $this->filesystem->has(self::COMPOSER_FILE)) {
+ return false;
+ }
+
+ $content = $this->filesystem->read(self::COMPOSER_FILE);
+ $json = json_decode($content,true);
+
+ return $json && key_exists('extra', $json) && key_exists('mozart', $json['extra']) && key_exists('packages', $json['extra']['mozart']) && in_array('crochetfeve0251/rocket-launcher-autoresolver', $json['extra']['mozart']['packages']);
+ }
+
  /**
  * Create an ID from the class.
  *
@@ -78,4 +89,5 @@ protected function create_id(string $class ) {
  $class = str_replace( '\\', '.', $class );
  return 'test-integration-' . strtolower( preg_replace( ['/([a-z])\d([A-Z])/', '/[^_]([A-Z][a-z])]/'], '$1_$2', $class ) );
  }
+
 }

inc/Services/ProviderManager.php

@@ -36,6 +36,11 @@ class ProviderManager
  */
  protected $renderer;
 
+ /**
+ * @var ProjectManager
+ */
+ protected $project_manager;
+
  /**
  * Instantiate the class.
  *
@@ -44,12 +49,13 @@ class ProviderManager
  * @param ClassGenerator $class_generator Class generator.
  * @param Renderer $renderer Renderer that handles layout of template files.
  */
- public function __construct(App $app, Filesystem $filesystem, ClassGenerator $class_generator, Renderer $renderer)
+ public function __construct(App $app, Filesystem $filesystem, ClassGenerator $class_generator, Renderer $renderer, ProjectManager $project_manager)
  {
  $this->app = $app;
  $this->filesystem = $filesystem;
  $this->class_generator = $class_generator;
  $this->renderer = $renderer;
+ $this->project_manager = $project_manager;
  }
 
  /**
@@ -81,6 +87,9 @@ public function maybe_generate_service_provider(string $namespace ) {
  * @throws \League\Flysystem\FileNotFoundException
  */
  public function add_class(string $path, string $class) {
+ if( $this->project_manager->is_resolver_present() ) {
+ return;
+ }
  $provider_path = $this->class_generator->generate_path( $path. '/ServiceProvider' );
  $provider_content = $this->filesystem->read( $provider_path );
 

templates/serviceprovider/autoresolver.php.tpl

@@ -0,0 +1,8 @@
+<?php
+
+namespace {{ namespace }};
+
+class {{ class_name }} extends Dependencies\RocketLauncherAutoresolver\ServiceProvider
+{
+
+}

templates/serviceprovider/vanilla.php.tpl

@@ -0,0 +1,35 @@
+<?php
+
+namespace {{ namespace }};
+
+use {{ base_namespace }}Dependencies\League\Container\ServiceProvider\AbstractServiceProvider;
+
+/**
+ * Service provider.
+ */
+class {{ class_name }} extends AbstractServiceProvider
+{
+
+ /**
+ * The provided array is a way to let the container
+ * know that a service is provided by this service
+ * provider. Every service that is registered via
+ * this service provider must have an alias added
+ * to this array or it will be ignored.
+ *
+ * @var array
+ */
+ protected $provides = [
+
+ ];
+
+ /**
+ * Registers items with the container
+ *
+ * @return void
+ */
+ public function register()
+ {
+
+ }
+}

tests/Fixtures/files/composer_autoresolver.json

@@ -0,0 +1,114 @@
+{
+ "name": "crochetfeve0251/rocket-launcher",
+ "description": "Template for a psr4 compatible plugin",
+ "keywords": [
+ "wordpress"
+ ],
+ "license": "GPL-2.0-or-later",
+ "authors": [
+ {
+ "name": "CrochetFeve0251"
+ }
+ ],
+ "type": "project",
+ "config": {
+ "sort-packages": true,
+ "preferred-install": {
+ "wp-media/phpunit": "source"
+ },
+ "process-timeout": 0,
+ "allow-plugins": {
+ "composer/installers": true,
+ "mnsami/composer-custom-directory-installer": true,
+ "dealerdirect/phpcodesniffer-composer-installer": true
+ }
+ },
+ "repositories": [
+ {
+ "type": "composer",
+ "url": "https://wpackagist.org"
+ }
+ ],
+ "require": {
+ "php": ">=7.0",
+ "berlindb/core": "^2.0",
+ "composer/installers": "^1.0 || ^2.0",
+ "monolog/monolog": "^1.0"
+ },
+ "require-dev": {
+ "php": "^7 || ^8",
+ "brain/monkey": "^2.0",
+ "coenjacobs/mozart": "^0.7",
+ "crochetfeve0251/rocket-launcher-builder": "^0.0.5",
+ "crochetfeve0251/rocket-launcher-take-off": "^0.0.2",
+ "crochetfeve0251/rocket-launcher-core": "^0.0.4",
+ "crochetfeve0251/rocket-launcher-autoresolver": "^0.0.3",
+ "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
+ "league/container": "^3.3",
+ "mnsami/composer-custom-directory-installer": "^2.0",
+ "phpcompatibility/phpcompatibility-wp": "^2.0",
+ "phpstan/phpstan": "^0.12",
+ "phpunit/phpunit": "^7.5 || ^8 || ^9",
+ "psr/container": "1.0.0",
+ "roave/security-advisories": "dev-master",
+ "szepeviktor/phpstan-wordpress": "^0.7.0",
+ "wp-coding-standards/wpcs": "^2",
+ "wp-media/phpunit": "^3.0"
+ },
+ "autoload": {
+ "classmap": [
+ "inc/classes"
+ ],
+ "psr-4": {
+ "PSR2Plugin\\": "inc/"
+ }
+ },
+ "autoload-dev": {
+ "psr-4": {
+ "PSR2Plugin\\Tests\\": "tests/"
+ }
+ },
+ "extra": {
+ "installer-paths": {
+ "vendor/{$vendor}/{$name}/": ["type:wordpress-plugin"]
+ },
+ "mozart": {
+ "dep_namespace": "PSR2Plugin\\Dependencies\\",
+ "dep_directory": "/inc/Dependencies/",
+ "classmap_directory": "/inc/classes/dependencies/",
+ "classmap_prefix": "PSR2Plugin",
+ "packages": [
+ "berlindb/core",
+ "league/container",
+ "crochetfeve0251/rocket-launcher-core",
+ "crochetfeve0251/rocket-launcher-autoresolver"
+ ]
+ }
+ },
+ "scripts": {
+ "test-unit": "\"vendor/bin/phpunit\" --testsuite unit --colors=always --configuration tests/Unit/phpunit.xml.dist",
+ "test-integration": "\"vendor/bin/phpunit\" --testsuite integration --colors=always --configuration tests/Integration/phpunit.xml.dist --exclude-group AdminOnly",
+ "test-integration-adminonly": "\"vendor/bin/phpunit\" --testsuite integration --colors=always --configuration tests/Integration/phpunit.xml.dist --group AdminOnly",
+ "run-tests": [
+ "@test-unit",
+ "@test-integration",
+ "@test-integration-adminonly"
+ ],
+ "run-stan": "vendor/bin/phpstan analyze --memory-limit=2G --no-progress",
+ "install-codestandards": "Dealerdirect\\Composer\\Plugin\\Installers\\PHPCodeSniffer\\Plugin::run",
+ "phpcs": "phpcs --basepath=.",
+ "phpcs-changed": "./bin/phpcs-changed.sh",
+ "phpcs:fix": "phpcbf",
+ "post-install-cmd": [
+ "\"vendor/bin/mozart\" compose",
+ "composer dump-autoload"
+ ],
+ "post-update-cmd": [
+ "\"vendor/bin/mozart\" compose",
+ "composer dump-autoload"
+ ],
+ "code-coverage": "\"vendor/bin/phpunit\" --testsuite unit --colors=always --configuration tests/Unit/phpunit.xml.dist --coverage-clover=tests/report/coverage.clover"
+ },
+ "minimum-stability": "stable",
+ "prefer-stable": true
+}