Skip to content

Commit

Permalink
Updated Monorepo Builder to commit 6c91bb88263e6679b1c90941d1b9653196…
Browse files Browse the repository at this point in the history
  • Loading branch information
actions-user committed Sep 27, 2021
1 parent 6a8f391 commit 73891b9
Show file tree
Hide file tree
Showing 1,067 changed files with 10,190 additions and 10,275 deletions.
2 changes: 1 addition & 1 deletion bin/monorepo-builder
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/usr/bin/env php
<?php
namespace MonorepoBuilder20210923;
namespace MonorepoBuilder20210927;

require_once __DIR__ . '/monorepo-builder.php';
22 changes: 11 additions & 11 deletions bin/monorepo-builder.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@

// decoupled in own "*.php" file, so ECS, Rector and PHPStan works out of the box here
declare (strict_types=1);
namespace MonorepoBuilder20210923;
namespace MonorepoBuilder20210927;

use MonorepoBuilder20210923\Symfony\Component\Console\Input\ArgvInput;
use MonorepoBuilder20210927\Symfony\Component\Console\Input\ArgvInput;
use Symplify\MonorepoBuilder\HttpKernel\MonorepoBuilderKernel;
use Symplify\MonorepoBuilder\ValueObject\File;
use MonorepoBuilder20210923\Symplify\SmartFileSystem\SmartFileInfo;
use MonorepoBuilder20210923\Symplify\SymplifyKernel\ValueObject\KernelBootAndApplicationRun;
use MonorepoBuilder20210927\Symplify\SmartFileSystem\SmartFileInfo;
use MonorepoBuilder20210927\Symplify\SymplifyKernel\ValueObject\KernelBootAndApplicationRun;
# 1. autoload
$possibleAutoloadPaths = [
// monorepo
Expand All @@ -29,24 +29,24 @@
require_once $scoperAutoloadFilepath;
}
$configFileInfos = [];
$argvInput = new \MonorepoBuilder20210923\Symfony\Component\Console\Input\ArgvInput();
$configFileInfo = \MonorepoBuilder20210923\resolveConfigFileInfo($argvInput);
if ($configFileInfo instanceof \MonorepoBuilder20210923\Symplify\SmartFileSystem\SmartFileInfo) {
$argvInput = new \MonorepoBuilder20210927\Symfony\Component\Console\Input\ArgvInput();
$configFileInfo = \MonorepoBuilder20210927\resolveConfigFileInfo($argvInput);
if ($configFileInfo instanceof \MonorepoBuilder20210927\Symplify\SmartFileSystem\SmartFileInfo) {
$configFileInfos[] = $configFileInfo;
}
$kernelBootAndApplicationRun = new \MonorepoBuilder20210923\Symplify\SymplifyKernel\ValueObject\KernelBootAndApplicationRun(\Symplify\MonorepoBuilder\HttpKernel\MonorepoBuilderKernel::class, $configFileInfos);
$kernelBootAndApplicationRun = new \MonorepoBuilder20210927\Symplify\SymplifyKernel\ValueObject\KernelBootAndApplicationRun(\Symplify\MonorepoBuilder\HttpKernel\MonorepoBuilderKernel::class, $configFileInfos);
$kernelBootAndApplicationRun->run();
function resolveConfigFileInfo(\MonorepoBuilder20210923\Symfony\Component\Console\Input\ArgvInput $argvInput) : ?\MonorepoBuilder20210923\Symplify\SmartFileSystem\SmartFileInfo
function resolveConfigFileInfo(\MonorepoBuilder20210927\Symfony\Component\Console\Input\ArgvInput $argvInput) : ?\MonorepoBuilder20210927\Symplify\SmartFileSystem\SmartFileInfo
{
if ($argvInput->hasParameterOption(['-c', '--config'])) {
$configOption = $argvInput->getParameterOption(['-c', '--config']);
if (\is_string($configOption) && \file_exists($configOption)) {
return new \MonorepoBuilder20210923\Symplify\SmartFileSystem\SmartFileInfo($configOption);
return new \MonorepoBuilder20210927\Symplify\SmartFileSystem\SmartFileInfo($configOption);
}
}
$defaultConfigFilePath = \getcwd() . '/' . \Symplify\MonorepoBuilder\ValueObject\File::CONFIG;
if (\file_exists($defaultConfigFilePath)) {
return new \MonorepoBuilder20210923\Symplify\SmartFileSystem\SmartFileInfo($defaultConfigFilePath);
return new \MonorepoBuilder20210927\Symplify\SmartFileSystem\SmartFileInfo($defaultConfigFilePath);
}
return null;
}
2 changes: 1 addition & 1 deletion config/config.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php

declare (strict_types=1);
namespace MonorepoBuilder20210923;
namespace MonorepoBuilder20210927;

use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
return static function (\Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator $containerConfigurator) : void {
Expand Down
2 changes: 1 addition & 1 deletion config/packages.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php

declare (strict_types=1);
namespace MonorepoBuilder20210923;
namespace MonorepoBuilder20210927;

use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
return static function (\Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator $containerConfigurator) : void {
Expand Down
6 changes: 3 additions & 3 deletions config/parameters.php
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?php

declare (strict_types=1);
namespace MonorepoBuilder20210923;
namespace MonorepoBuilder20210927;

use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
use MonorepoBuilder20210923\Symplify\ComposerJsonManipulator\ValueObject\ComposerJsonSection;
use MonorepoBuilder20210927\Symplify\ComposerJsonManipulator\ValueObject\ComposerJsonSection;
use Symplify\MonorepoBuilder\ValueObject\Option;
return static function (\Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator $containerConfigurator) : void {
$parameters = $containerConfigurator->parameters();
Expand All @@ -22,5 +22,5 @@
$parameters->set(\Symplify\MonorepoBuilder\ValueObject\Option::ROOT_DIRECTORY, \getcwd());
$parameters->set(\Symplify\MonorepoBuilder\ValueObject\Option::PACKAGE_ALIAS_FORMAT, '<major>.<minor>-dev');
$parameters->set(\Symplify\MonorepoBuilder\ValueObject\Option::INLINE_SECTIONS, ['keywords']);
$parameters->set(\Symplify\MonorepoBuilder\ValueObject\Option::SECTION_ORDER, [\MonorepoBuilder20210923\Symplify\ComposerJsonManipulator\ValueObject\ComposerJsonSection::NAME, \MonorepoBuilder20210923\Symplify\ComposerJsonManipulator\ValueObject\ComposerJsonSection::TYPE, \MonorepoBuilder20210923\Symplify\ComposerJsonManipulator\ValueObject\ComposerJsonSection::DESCRIPTION, \MonorepoBuilder20210923\Symplify\ComposerJsonManipulator\ValueObject\ComposerJsonSection::KEYWORDS, \MonorepoBuilder20210923\Symplify\ComposerJsonManipulator\ValueObject\ComposerJsonSection::HOMEPAGE, \MonorepoBuilder20210923\Symplify\ComposerJsonManipulator\ValueObject\ComposerJsonSection::LICENSE, \MonorepoBuilder20210923\Symplify\ComposerJsonManipulator\ValueObject\ComposerJsonSection::AUTHORS, \MonorepoBuilder20210923\Symplify\ComposerJsonManipulator\ValueObject\ComposerJsonSection::BIN, \MonorepoBuilder20210923\Symplify\ComposerJsonManipulator\ValueObject\ComposerJsonSection::REQUIRE, \MonorepoBuilder20210923\Symplify\ComposerJsonManipulator\ValueObject\ComposerJsonSection::REQUIRE_DEV, \MonorepoBuilder20210923\Symplify\ComposerJsonManipulator\ValueObject\ComposerJsonSection::AUTOLOAD, \MonorepoBuilder20210923\Symplify\ComposerJsonManipulator\ValueObject\ComposerJsonSection::AUTOLOAD_DEV, \MonorepoBuilder20210923\Symplify\ComposerJsonManipulator\ValueObject\ComposerJsonSection::REPOSITORIES, \MonorepoBuilder20210923\Symplify\ComposerJsonManipulator\ValueObject\ComposerJsonSection::PROVIDES, \MonorepoBuilder20210923\Symplify\ComposerJsonManipulator\ValueObject\ComposerJsonSection::CONFLICT, \MonorepoBuilder20210923\Symplify\ComposerJsonManipulator\ValueObject\ComposerJsonSection::REPLACE, \MonorepoBuilder20210923\Symplify\ComposerJsonManipulator\ValueObject\ComposerJsonSection::SCRIPTS, \MonorepoBuilder20210923\Symplify\ComposerJsonManipulator\ValueObject\ComposerJsonSection::SCRIPTS_DESCRIPTIONS, \MonorepoBuilder20210923\Symplify\ComposerJsonManipulator\ValueObject\ComposerJsonSection::SUGGEST, \MonorepoBuilder20210923\Symplify\ComposerJsonManipulator\ValueObject\ComposerJsonSection::CONFIG, \MonorepoBuilder20210923\Symplify\ComposerJsonManipulator\ValueObject\ComposerJsonSection::MINIMUM_STABILITY, \MonorepoBuilder20210923\Symplify\ComposerJsonManipulator\ValueObject\ComposerJsonSection::PREFER_STABLE, \MonorepoBuilder20210923\Symplify\ComposerJsonManipulator\ValueObject\ComposerJsonSection::EXTRA]);
$parameters->set(\Symplify\MonorepoBuilder\ValueObject\Option::SECTION_ORDER, [\MonorepoBuilder20210927\Symplify\ComposerJsonManipulator\ValueObject\ComposerJsonSection::NAME, \MonorepoBuilder20210927\Symplify\ComposerJsonManipulator\ValueObject\ComposerJsonSection::TYPE, \MonorepoBuilder20210927\Symplify\ComposerJsonManipulator\ValueObject\ComposerJsonSection::DESCRIPTION, \MonorepoBuilder20210927\Symplify\ComposerJsonManipulator\ValueObject\ComposerJsonSection::KEYWORDS, \MonorepoBuilder20210927\Symplify\ComposerJsonManipulator\ValueObject\ComposerJsonSection::HOMEPAGE, \MonorepoBuilder20210927\Symplify\ComposerJsonManipulator\ValueObject\ComposerJsonSection::LICENSE, \MonorepoBuilder20210927\Symplify\ComposerJsonManipulator\ValueObject\ComposerJsonSection::AUTHORS, \MonorepoBuilder20210927\Symplify\ComposerJsonManipulator\ValueObject\ComposerJsonSection::BIN, \MonorepoBuilder20210927\Symplify\ComposerJsonManipulator\ValueObject\ComposerJsonSection::REQUIRE, \MonorepoBuilder20210927\Symplify\ComposerJsonManipulator\ValueObject\ComposerJsonSection::REQUIRE_DEV, \MonorepoBuilder20210927\Symplify\ComposerJsonManipulator\ValueObject\ComposerJsonSection::AUTOLOAD, \MonorepoBuilder20210927\Symplify\ComposerJsonManipulator\ValueObject\ComposerJsonSection::AUTOLOAD_DEV, \MonorepoBuilder20210927\Symplify\ComposerJsonManipulator\ValueObject\ComposerJsonSection::REPOSITORIES, \MonorepoBuilder20210927\Symplify\ComposerJsonManipulator\ValueObject\ComposerJsonSection::PROVIDES, \MonorepoBuilder20210927\Symplify\ComposerJsonManipulator\ValueObject\ComposerJsonSection::CONFLICT, \MonorepoBuilder20210927\Symplify\ComposerJsonManipulator\ValueObject\ComposerJsonSection::REPLACE, \MonorepoBuilder20210927\Symplify\ComposerJsonManipulator\ValueObject\ComposerJsonSection::SCRIPTS, \MonorepoBuilder20210927\Symplify\ComposerJsonManipulator\ValueObject\ComposerJsonSection::SCRIPTS_DESCRIPTIONS, \MonorepoBuilder20210927\Symplify\ComposerJsonManipulator\ValueObject\ComposerJsonSection::SUGGEST, \MonorepoBuilder20210927\Symplify\ComposerJsonManipulator\ValueObject\ComposerJsonSection::CONFIG, \MonorepoBuilder20210927\Symplify\ComposerJsonManipulator\ValueObject\ComposerJsonSection::MINIMUM_STABILITY, \MonorepoBuilder20210927\Symplify\ComposerJsonManipulator\ValueObject\ComposerJsonSection::PREFER_STABLE, \MonorepoBuilder20210927\Symplify\ComposerJsonManipulator\ValueObject\ComposerJsonSection::EXTRA]);
};
18 changes: 9 additions & 9 deletions config/services.php
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
<?php

declare (strict_types=1);
namespace MonorepoBuilder20210923;
namespace MonorepoBuilder20210927;

use MonorepoBuilder20210923\Symfony\Component\Console\Application;
use MonorepoBuilder20210927\Symfony\Component\Console\Application;
use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
use Symplify\MonorepoBuilder\Console\MonorepoBuilderConsoleApplication;
use MonorepoBuilder20210923\Symplify\PackageBuilder\Console\Command\CommandNaming;
use MonorepoBuilder20210923\Symplify\PackageBuilder\Reflection\PrivatesCaller;
use MonorepoBuilder20210923\Symplify\PackageBuilder\Yaml\ParametersMerger;
use MonorepoBuilder20210927\Symplify\PackageBuilder\Console\Command\CommandNaming;
use MonorepoBuilder20210927\Symplify\PackageBuilder\Reflection\PrivatesCaller;
use MonorepoBuilder20210927\Symplify\PackageBuilder\Yaml\ParametersMerger;
return static function (\Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator $containerConfigurator) : void {
$services = $containerConfigurator->services();
$services->defaults()->public()->autowire()->autoconfigure();
$services->load('Symplify\MonorepoBuilder\\', __DIR__ . '/../src')->exclude([__DIR__ . '/../src/Exception', __DIR__ . '/../src/HttpKernel', __DIR__ . '/../src/ValueObject']);
// console
$services->set(\Symplify\MonorepoBuilder\Console\MonorepoBuilderConsoleApplication::class);
$services->alias(\MonorepoBuilder20210923\Symfony\Component\Console\Application::class, \Symplify\MonorepoBuilder\Console\MonorepoBuilderConsoleApplication::class);
$services->set(\MonorepoBuilder20210923\Symplify\PackageBuilder\Console\Command\CommandNaming::class);
$services->set(\MonorepoBuilder20210923\Symplify\PackageBuilder\Reflection\PrivatesCaller::class);
$services->set(\MonorepoBuilder20210923\Symplify\PackageBuilder\Yaml\ParametersMerger::class);
$services->alias(\MonorepoBuilder20210927\Symfony\Component\Console\Application::class, \Symplify\MonorepoBuilder\Console\MonorepoBuilderConsoleApplication::class);
$services->set(\MonorepoBuilder20210927\Symplify\PackageBuilder\Console\Command\CommandNaming::class);
$services->set(\MonorepoBuilder20210927\Symplify\PackageBuilder\Reflection\PrivatesCaller::class);
$services->set(\MonorepoBuilder20210927\Symplify\PackageBuilder\Yaml\ParametersMerger::class);
};
12 changes: 6 additions & 6 deletions packages/Init/Command/InitCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
declare (strict_types=1);
namespace Symplify\MonorepoBuilder\Init\Command;

use MonorepoBuilder20210923\Symfony\Component\Console\Input\InputArgument;
use MonorepoBuilder20210923\Symfony\Component\Console\Input\InputInterface;
use MonorepoBuilder20210923\Symfony\Component\Console\Output\OutputInterface;
use MonorepoBuilder20210923\Symplify\PackageBuilder\Console\Command\AbstractSymplifyCommand;
final class InitCommand extends \MonorepoBuilder20210923\Symplify\PackageBuilder\Console\Command\AbstractSymplifyCommand
use MonorepoBuilder20210927\Symfony\Component\Console\Input\InputArgument;
use MonorepoBuilder20210927\Symfony\Component\Console\Input\InputInterface;
use MonorepoBuilder20210927\Symfony\Component\Console\Output\OutputInterface;
use MonorepoBuilder20210927\Symplify\PackageBuilder\Console\Command\AbstractSymplifyCommand;
final class InitCommand extends \MonorepoBuilder20210927\Symplify\PackageBuilder\Console\Command\AbstractSymplifyCommand
{
/**
* @var string
Expand All @@ -16,7 +16,7 @@ final class InitCommand extends \MonorepoBuilder20210923\Symplify\PackageBuilder
protected function configure() : void
{
$this->setDescription('Creates empty monorepo directory and composer.json structure.');
$this->addArgument(self::OUTPUT, \MonorepoBuilder20210923\Symfony\Component\Console\Input\InputArgument::OPTIONAL, 'Directory to generate monorepo into.', \getcwd());
$this->addArgument(self::OUTPUT, \MonorepoBuilder20210927\Symfony\Component\Console\Input\InputArgument::OPTIONAL, 'Directory to generate monorepo into.', \getcwd());
}
/**
* @param \Symfony\Component\Console\Input\InputInterface $input
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
declare (strict_types=1);
namespace Symplify\MonorepoBuilder\Merge\Application;

use MonorepoBuilder20210923\Symplify\ComposerJsonManipulator\ValueObject\ComposerJson;
use MonorepoBuilder20210927\Symplify\ComposerJsonManipulator\ValueObject\ComposerJson;
use Symplify\MonorepoBuilder\Merge\ComposerJsonMerger;
use Symplify\MonorepoBuilder\Merge\Contract\ComposerJsonDecoratorInterface;
use MonorepoBuilder20210923\Symplify\SmartFileSystem\SmartFileInfo;
use MonorepoBuilder20210927\Symplify\SmartFileSystem\SmartFileInfo;
/**
* @see \Symplify\MonorepoBuilder\Tests\Merge\Application\MergedAndDecoratedComposerJsonFactoryTest
*/
Expand All @@ -17,7 +17,7 @@ final class MergedAndDecoratedComposerJsonFactory
*/
private $composerJsonMerger;
/**
* @var mixed[]
* @var \Symplify\MonorepoBuilder\Merge\Contract\ComposerJsonDecoratorInterface[]
*/
private $composerJsonDecorators;
/**
Expand All @@ -31,15 +31,15 @@ public function __construct(\Symplify\MonorepoBuilder\Merge\ComposerJsonMerger $
/**
* @param SmartFileInfo[] $packageFileInfos
*/
public function createFromRootConfigAndPackageFileInfos(\MonorepoBuilder20210923\Symplify\ComposerJsonManipulator\ValueObject\ComposerJson $mainComposerJson, array $packageFileInfos) : void
public function createFromRootConfigAndPackageFileInfos(\MonorepoBuilder20210927\Symplify\ComposerJsonManipulator\ValueObject\ComposerJson $mainComposerJson, array $packageFileInfos) : void
{
$mergedAndDecoratedComposerJson = $this->mergePackageFileInfosAndDecorate($packageFileInfos);
$this->composerJsonMerger->mergeJsonToRoot($mainComposerJson, $mergedAndDecoratedComposerJson);
}
/**
* @param SmartFileInfo[] $packageFileInfos
*/
private function mergePackageFileInfosAndDecorate(array $packageFileInfos) : \MonorepoBuilder20210923\Symplify\ComposerJsonManipulator\ValueObject\ComposerJson
private function mergePackageFileInfosAndDecorate(array $packageFileInfos) : \MonorepoBuilder20210927\Symplify\ComposerJsonManipulator\ValueObject\ComposerJson
{
$mergedComposerJson = $this->composerJsonMerger->mergeFileInfos($packageFileInfos);
foreach ($this->composerJsonDecorators as $composerJsonDecorator) {
Expand Down
4 changes: 2 additions & 2 deletions packages/Merge/Arrays/SortedParameterMerger.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
declare (strict_types=1);
namespace Symplify\MonorepoBuilder\Merge\Arrays;

use MonorepoBuilder20210923\Symplify\PackageBuilder\Yaml\ParametersMerger;
use MonorepoBuilder20210927\Symplify\PackageBuilder\Yaml\ParametersMerger;
final class SortedParameterMerger
{
/**
Expand All @@ -14,7 +14,7 @@ final class SortedParameterMerger
* @var \Symplify\MonorepoBuilder\Merge\Arrays\ArraySorter
*/
private $arraySorter;
public function __construct(\MonorepoBuilder20210923\Symplify\PackageBuilder\Yaml\ParametersMerger $parametersMerger, \Symplify\MonorepoBuilder\Merge\Arrays\ArraySorter $arraySorter)
public function __construct(\MonorepoBuilder20210927\Symplify\PackageBuilder\Yaml\ParametersMerger $parametersMerger, \Symplify\MonorepoBuilder\Merge\Arrays\ArraySorter $arraySorter)
{
$this->parametersMerger = $parametersMerger;
$this->arraySorter = $arraySorter;
Expand Down
4 changes: 2 additions & 2 deletions packages/Merge/Cleaner/RequireRequireDevDuplicateCleaner.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
declare (strict_types=1);
namespace Symplify\MonorepoBuilder\Merge\Cleaner;

use MonorepoBuilder20210923\Symplify\ComposerJsonManipulator\ValueObject\ComposerJson;
use MonorepoBuilder20210927\Symplify\ComposerJsonManipulator\ValueObject\ComposerJson;
final class RequireRequireDevDuplicateCleaner
{
/**
* @param array<string, mixed> $requireDev
* @return array<string, mixed>
*/
public function unsetPackageFromRequire(\MonorepoBuilder20210923\Symplify\ComposerJsonManipulator\ValueObject\ComposerJson $mainComposerJson, array $requireDev) : array
public function unsetPackageFromRequire(\MonorepoBuilder20210927\Symplify\ComposerJsonManipulator\ValueObject\ComposerJson $mainComposerJson, array $requireDev) : array
{
// give require priority
$requirePackageNames = $mainComposerJson->getRequirePackageNames();
Expand Down
Loading

0 comments on commit 73891b9

Please sign in to comment.