Skip to content
Snippets Groups Projects
Commit 8f768c1d authored by Adam G-H's avatar Adam G-H
Browse files

Rename copier to syncer

parent 92120ef0
No related branches found
No related tags found
No related merge requests found
...@@ -31,34 +31,34 @@ services: ...@@ -31,34 +31,34 @@ services:
- '@package_manager.executable_finder' - '@package_manager.executable_finder'
- '@package_manager.process_factory' - '@package_manager.process_factory'
# File copiers. # File syncers.
package_manager.file_copier.rsync: package_manager.file_syncer.rsync:
class: PhpTuf\ComposerStager\Infrastructure\Process\FileCopier\RsyncFileCopier class: PhpTuf\ComposerStager\Infrastructure\FileSyncer\RsyncFileSyncer
arguments: arguments:
- '@package_manager.file_system' - '@package_manager.file_system'
- '@package_manager.rsync_runner' - '@package_manager.rsync_runner'
package_manager.file_copier.php: package_manager.file_syncer.php:
class: PhpTuf\ComposerStager\Infrastructure\Process\FileCopier\PhpFileCopier class: PhpTuf\ComposerStager\Infrastructure\FileSyncer\PhpFileSyncer
arguments: arguments:
- '@package_manager.file_system' - '@package_manager.file_system'
- '@package_manager.symfony_finder' - '@package_manager.symfony_finder'
- '@package_manager.symfony_finder' - '@package_manager.symfony_finder'
package_manager.file_copier.factory: package_manager.file_syncer.factory:
class: Drupal\package_manager\FileCopierFactory class: Drupal\package_manager\FileSyncerFactory
arguments: arguments:
- '@package_manager.symfony_executable_finder' - '@package_manager.symfony_executable_finder'
- '@package_manager.file_copier.php' - '@package_manager.file_syncer.php'
- '@package_manager.file_copier.rsync' - '@package_manager.file_syncer.rsync'
- '@config.factory' - '@config.factory'
package_manager.file_copier: package_manager.file_syncer:
class: PhpTuf\ComposerStager\Infrastructure\Process\FileCopier\FileCopierInterface class: PhpTuf\ComposerStager\Infrastructure\FileSyncer\FileSyncerInterface
factory: ['@package_manager.file_copier.factory', 'create'] factory: ['@package_manager.file_syncer.factory', 'create']
# Domain services. # Domain services.
package_manager.beginner: package_manager.beginner:
class: PhpTuf\ComposerStager\Domain\Beginner class: PhpTuf\ComposerStager\Domain\Beginner
arguments: arguments:
- '@package_manager.file_copier' - '@package_manager.file_syncer'
- '@package_manager.file_system' - '@package_manager.file_system'
package_manager.stager: package_manager.stager:
class: PhpTuf\ComposerStager\Domain\Stager class: PhpTuf\ComposerStager\Domain\Stager
...@@ -68,7 +68,7 @@ services: ...@@ -68,7 +68,7 @@ services:
package_manager.committer: package_manager.committer:
class: PhpTuf\ComposerStager\Domain\Committer class: PhpTuf\ComposerStager\Domain\Committer
arguments: arguments:
- '@package_manager.file_copier' - '@package_manager.file_syncer'
- '@package_manager.file_system' - '@package_manager.file_system'
package_manager.cleaner: package_manager.cleaner:
class: PhpTuf\ComposerStager\Domain\Cleaner class: PhpTuf\ComposerStager\Domain\Cleaner
......
...@@ -3,38 +3,36 @@ ...@@ -3,38 +3,36 @@
namespace Drupal\package_manager; namespace Drupal\package_manager;
use Drupal\Core\Config\ConfigFactoryInterface; use Drupal\Core\Config\ConfigFactoryInterface;
use PhpTuf\ComposerStager\Infrastructure\Process\FileCopier\FileCopierFactory as StagerFileCopierFactory; use PhpTuf\ComposerStager\Infrastructure\FileSyncer\FileSyncerFactoryInterface;
use PhpTuf\ComposerStager\Infrastructure\Process\FileCopier\FileCopierFactoryInterface; use PhpTuf\ComposerStager\Infrastructure\FileSyncer\FileSyncerFactory as StagerFileSyncerFactory;
use PhpTuf\ComposerStager\Infrastructure\Process\FileCopier\FileCopierInterface; use PhpTuf\ComposerStager\Infrastructure\FileSyncer\FileSyncerInterface;
use PhpTuf\ComposerStager\Infrastructure\Process\FileCopier\PhpFileCopierInterface;
use PhpTuf\ComposerStager\Infrastructure\Process\FileCopier\RsyncFileCopierInterface;
use Symfony\Component\Process\ExecutableFinder; use Symfony\Component\Process\ExecutableFinder;
/** /**
* A file copier factory which returns file copiers according to configuration. * A file syncer factory which returns file copiers according to configuration.
*/ */
class FileCopierFactory implements FileCopierFactoryInterface { class FileSyncerFactory implements FileSyncerFactoryInterface {
/** /**
* The decorated file copier factory. * The decorated file copier factory.
* *
* @var \PhpTuf\ComposerStager\Infrastructure\Process\FileCopier\FileCopierFactoryInterface * @var \PhpTuf\ComposerStager\Infrastructure\FileSyncer\FileSyncerFactoryInterface
*/ */
protected $decorated; protected $decorated;
/** /**
* The PHP file copier service. * The PHP file syncer service.
* *
* @var \PhpTuf\ComposerStager\Infrastructure\Process\FileCopier\PhpFileCopierInterface * @var \PhpTuf\ComposerStager\Infrastructure\FileSyncer\FileSyncerInterface
*/ */
protected $phpFileCopier; protected $phpFileSyncer;
/** /**
* The rsync file copier service. * The rsync file syncer service.
* *
* @var \PhpTuf\ComposerStager\Infrastructure\Process\FileCopier\RsyncFileCopierInterface * @var \PhpTuf\ComposerStager\Infrastructure\FileSyncer\FileSyncerInterface
*/ */
protected $rsyncFileCopier; protected $rsyncFileSyncer;
/** /**
* The config factory service. * The config factory service.
...@@ -48,33 +46,33 @@ class FileCopierFactory implements FileCopierFactoryInterface { ...@@ -48,33 +46,33 @@ class FileCopierFactory implements FileCopierFactoryInterface {
* *
* @param \Symfony\Component\Process\ExecutableFinder $executable_finder * @param \Symfony\Component\Process\ExecutableFinder $executable_finder
* The Symfony executable finder. * The Symfony executable finder.
* @param \PhpTuf\ComposerStager\Infrastructure\Process\FileCopier\PhpFileCopierInterface $php_file_copier * @param \PhpTuf\ComposerStager\Infrastructure\FileSyncer\FileSyncerInterface $php_file_copier
* The PHP file copier service. * The PHP file syncer service.
* @param \PhpTuf\ComposerStager\Infrastructure\Process\FileCopier\RsyncFileCopierInterface $rsync_file_copier * @param \PhpTuf\ComposerStager\Infrastructure\FileSyncer\FileSyncerInterface $rsync_file_copier
* The rsync file copier service. * The rsync file syncer service.
* @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
* The config factory service. * The config factory service.
*/ */
public function __construct(ExecutableFinder $executable_finder, PhpFileCopierInterface $php_file_copier, RsyncFileCopierInterface $rsync_file_copier, ConfigFactoryInterface $config_factory) { public function __construct(ExecutableFinder $executable_finder, FileSyncerInterface $php_file_copier, FileSyncerInterface $rsync_file_copier, ConfigFactoryInterface $config_factory) {
$this->decorated = new StagerFileCopierFactory($executable_finder, $php_file_copier, $rsync_file_copier); $this->decorated = new StagerFileSyncerFactory($executable_finder, $php_file_copier, $rsync_file_copier);
$this->phpFileCopier = $php_file_copier; $this->phpFileSyncer = $php_file_copier;
$this->rsyncFileCopier = $rsync_file_copier; $this->rsyncFileSyncer = $rsync_file_copier;
$this->configFactory = $config_factory; $this->configFactory = $config_factory;
} }
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
public function create(): FileCopierInterface { public function create(): FileSyncerInterface {
$copier = $this->configFactory->get('package_manager.settings') $copier = $this->configFactory->get('package_manager.settings')
->get('file_copier'); ->get('file_copier');
switch ($copier) { switch ($copier) {
case 'rsync': case 'rsync':
return $this->rsyncFileCopier; return $this->rsyncFileSyncer;
case 'php': case 'php':
return $this->phpFileCopier; return $this->phpFileSyncer;
default: default:
return $this->decorated->create(); return $this->decorated->create();
......
...@@ -5,7 +5,7 @@ namespace Drupal\Tests\package_manager\Kernel; ...@@ -5,7 +5,7 @@ namespace Drupal\Tests\package_manager\Kernel;
use Drupal\KernelTests\KernelTestBase; use Drupal\KernelTests\KernelTestBase;
/** /**
* @covers \Drupal\package_manager\FileCopierFactory * @covers \Drupal\package_manager\FileSyncerFactory
* *
* @group package_manager * @group package_manager
*/ */
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment