APPS-4250: APPS-4251 fix executable path in syncapi sdk (#2)

* APPS-4251 Fixed executable path. Co-authored-by: stereomon <[email protected]> Co-authored-by: Artem Miroshnikov <[email protected]>
spryker-sdk · May 20, 2022 · 40cd87f · 40cd87f
1 parent 480da3d
commit 40cd87f
Show file tree

Hide file tree

Showing 35 changed files with 356 additions and 204 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -21,7 +21,6 @@ jobs:
                     '7.4',
                     '8.1'
                 ]
-
         steps:
             - uses: actions/checkout@v2
 
@@ -52,7 +51,7 @@ jobs:
               run: composer --version
 
             - name: Composer install
-              run: composer install
+              run: composer install --optimize-autoloader
 
             - name: Run PHPStan
               run: composer stan
@@ -76,3 +75,49 @@ jobs:
               uses: codecov/codecov-action@v1
               with:
                   file: ./tests/_output/coverage.xml
+
+    prefer-lowest:
+        name: "Prefer lowest checks"
+        runs-on: ubuntu-18.04
+        env:
+            APPLICATION_ENV: testing
+        strategy:
+            fail-fast: false
+            matrix:
+                php-version: [
+                    '7.4'
+                ]
+        steps:
+            - uses: actions/checkout@v2
+
+            - name: Setup PHP
+              uses: shivammathur/setup-php@v2
+              with:
+                  php-version: ${{ matrix.php-version }}
+                  extensions: mbstring, intl, pdo_mysql, redis
+                  tools: composer:v2
+
+            - name: Composer get cache directory
+              id: composer-cache
+              run: |
+                  echo "::set-output name=dir::$(composer config cache-files-dir)"
+
+            - name: Composer cache
+              uses: actions/cache@v2
+              with:
+                  path: ${{ steps.composer-cache.outputs.dir }}
+                  key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+                  restore-keys: |
+                      ${{ runner.os }}-composer-
+
+            - name: Composer validate
+              run: composer validate
+
+            - name: Composer version
+              run: composer --version
+
+            - name: "Install lowest dependencies"
+              run: composer update --prefer-lowest
+
+            - name: Codecept tests
+              run: composer test
diff --git a/composer.json b/composer.json
@@ -6,31 +6,31 @@
     "require": {
         "php": ">=7.4",
         "cebe/php-openapi": "^1.6",
-        "doctrine/inflector": "^2.0",
+        "doctrine/inflector": "^1.4.0 || ^2.0",
         "spryker-sdk/spryk": "^0.4.0",
-        "symfony/console": "^5.3 || ^6.0",
-        "symfony/finder": "^5.3 || ^6.0",
-        "symfony/process": "^5.4"
+        "symfony/console": "^4.0.0 || ^5.3 || ^6.0",
+        "symfony/finder": "^4.0.0 || ^5.3 || ^6.0",
+        "symfony/process": "^4.0.0 || ^5.4"
     },
     "require-dev": {
         "codeception/codeception": "*",
         "codeception/module-asserts": "*",
         "mikey179/vfsstream": "^1.6",
         "sllh/composer-versions-check": "^2.0",
         "spryker-sdk/architector": "0.1.x-dev",
-        "spryker/code-sniffer": "*",
-        "symfony/filesystem": "^5.3",
+        "spryker/code-sniffer": "dev-master",
+        "symfony/filesystem": "^4.0 || ^5.3",
         "symfony/var-dumper": "*"
     },
     "autoload": {
         "psr-4": {
-            "SprykerSdk\\SyncApi\\": "src/SprykerSdk/SyncApi",
-            "Generated\\Shared\\Transfer\\": "src/Generated/Shared/Transfer/"
+            "SprykerSdk\\SyncApi\\": "src/SprykerSdk/SyncApi/",
+            "Transfer\\": "src/Transfer/"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "SprykerSdkTest\\SyncApi\\": "tests/SprykerSdkTest/SyncApi",
+            "SprykerSdkTest\\SyncApi\\": "tests/SprykerSdkTest/SyncApi/",
             "SprykerSdkTest\\Helper\\": "tests/_support/Helper/"
         }
     },

diff --git a/phpstan.neon b/phpstan.neon
@@ -4,3 +4,9 @@ parameters:
 
     bootstrapFiles:
         - phpstan-bootstrap.php
+
+    ignoreErrors:
+        - '#Binary operation "\." between array<string>\|bool\|string\|null and .+ results in an error.#'
+        - '#Parameter .+ of method .+Transfer::.+\(\).+ given.#'
+
+    reportUnmatchedIgnoredErrors: false
diff --git a/src/SprykerSdk/SyncApi/Console/AbstractConsole.php b/src/SprykerSdk/SyncApi/Console/AbstractConsole.php
@@ -72,7 +72,7 @@ protected function getFacade(): SyncApiFacadeInterface
 
     /**
      * @param \Symfony\Component\Console\Output\OutputInterface $output
-     * @param \ArrayObject<int, \Generated\Shared\Transfer\MessageTransfer> $messageTransfers
+     * @param \ArrayObject<int, \Transfer\MessageTransfer> $messageTransfers
      *
      * @return void
      */

diff --git a/src/SprykerSdk/SyncApi/Console/OpenApiCodeGenerateConsole.php b/src/SprykerSdk/SyncApi/Console/OpenApiCodeGenerateConsole.php
@@ -7,10 +7,10 @@
 
 namespace SprykerSdk\SyncApi\Console;
 
-use Generated\Shared\Transfer\OpenApiRequestTransfer;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
+use Transfer\OpenApiRequestTransfer;
 
 class OpenApiCodeGenerateConsole extends AbstractConsole
 {
@@ -44,24 +44,13 @@ class OpenApiCodeGenerateConsole extends AbstractConsole
      */
     public const OPTION_ORGANIZATION_SHORT = 'o';
 
-    /**
-     * @var string
-     */
-    public const OPTION_PROJECT_ROOT = 'project-root';
-
-    /**
-     * @var string
-     */
-    public const OPTION_PROJECT_ROOT_SHORT = 'r';
-
     /**
      * @return void
      */
     protected function configure(): void
     {
         $this->setName('code:openapi:generate')
             ->setDescription('Generates code from an OpenAPI file definition.')
-            ->addOption(static::OPTION_PROJECT_ROOT, static::OPTION_PROJECT_ROOT_SHORT, InputOption::VALUE_REQUIRED, '', getcwd())
             ->addOption(static::OPTION_OPEN_API_FILE, static::OPTION_OPEN_API_FILE_SHORT, InputOption::VALUE_REQUIRED, '', $this->getConfig()->getDefaultRelativePathToOpenApiFile())
             ->addOption(static::APPLICATION_TYPE, static::APPLICATION_TYPE_SHORT, InputOption::VALUE_REQUIRED, '', 'backend')
             ->addOption(static::OPTION_ORGANIZATION, static::OPTION_ORGANIZATION_SHORT, InputOption::VALUE_REQUIRED, 'Namespace that should be used for the code builder. When set to Spryker code will be generated in the core modules.', 'App');
@@ -78,7 +67,6 @@ public function execute(InputInterface $input, OutputInterface $output): int
         $openApiRequestTransfer = new OpenApiRequestTransfer();
         $openApiRequestTransfer
             ->setTargetFile($input->getOption(static::OPTION_OPEN_API_FILE))
-            ->setProjectRoot($input->getOption(static::OPTION_PROJECT_ROOT))
             ->setApplicationType($input->getOption(static::APPLICATION_TYPE))
             ->setOrganization($input->getOption(static::OPTION_ORGANIZATION));
 

diff --git a/src/SprykerSdk/SyncApi/Console/OpenApiCreateConsole.php b/src/SprykerSdk/SyncApi/Console/OpenApiCreateConsole.php
@@ -7,12 +7,12 @@
 
 namespace SprykerSdk\SyncApi\Console;
 
-use Generated\Shared\Transfer\OpenApiRequestTransfer;
-use Generated\Shared\Transfer\OpenApiTransfer;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
+use Transfer\OpenApiRequestTransfer;
+use Transfer\OpenApiTransfer;
 
 class OpenApiCreateConsole extends AbstractConsole
 {

diff --git a/src/SprykerSdk/SyncApi/Console/OpenApiValidateConsole.php b/src/SprykerSdk/SyncApi/Console/OpenApiValidateConsole.php
@@ -7,10 +7,10 @@
 
 namespace SprykerSdk\SyncApi\Console;
 
-use Generated\Shared\Transfer\ValidateRequestTransfer;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
+use Transfer\ValidateRequestTransfer;
 
 class OpenApiValidateConsole extends AbstractConsole
 {

diff --git a/src/SprykerSdk/SyncApi/Message/MessageBuilder.php b/src/SprykerSdk/SyncApi/Message/MessageBuilder.php
@@ -7,14 +7,14 @@
 
 namespace SprykerSdk\SyncApi\Message;
 
-use Generated\Shared\Transfer\MessageTransfer;
+use Transfer\MessageTransfer;
 
 class MessageBuilder implements MessageBuilderInterface
 {
     /**
      * @param string $message
      *
-     * @return \Generated\Shared\Transfer\MessageTransfer
+     * @return \Transfer\MessageTransfer
      */
     public function buildMessage(string $message): MessageTransfer
     {

diff --git a/src/SprykerSdk/SyncApi/Message/MessageBuilderInterface.php b/src/SprykerSdk/SyncApi/Message/MessageBuilderInterface.php
@@ -7,14 +7,14 @@
 
 namespace SprykerSdk\SyncApi\Message;
 
-use Generated\Shared\Transfer\MessageTransfer;
+use Transfer\MessageTransfer;
 
 interface MessageBuilderInterface
 {
     /**
      * @param string $message
      *
-     * @return \Generated\Shared\Transfer\MessageTransfer
+     * @return \Transfer\MessageTransfer
      */
     public function buildMessage(string $message): MessageTransfer;
 }
diff --git a/src/SprykerSdk/SyncApi/OpenApi/Builder/OpenApiBuilder.php b/src/SprykerSdk/SyncApi/OpenApi/Builder/OpenApiBuilder.php
@@ -7,12 +7,12 @@
 
 namespace SprykerSdk\SyncApi\OpenApi\Builder;
 
-use Generated\Shared\Transfer\OpenApiRequestTransfer;
-use Generated\Shared\Transfer\OpenApiResponseTransfer;
 use SprykerSdk\SyncApi\Message\MessageBuilderInterface;
 use SprykerSdk\SyncApi\Message\SyncApiError;
 use SprykerSdk\SyncApi\Message\SyncApiInfo;
 use Symfony\Component\Yaml\Yaml;
+use Transfer\OpenApiRequestTransfer;
+use Transfer\OpenApiResponseTransfer;
 
 class OpenApiBuilder implements OpenApiBuilderInterface
 {
@@ -30,9 +30,9 @@ public function __construct(MessageBuilderInterface $messageBuilder)
     }
 
     /**
-     * @param \Generated\Shared\Transfer\OpenApiRequestTransfer $openApiRequestTransfer
+     * @param \Transfer\OpenApiRequestTransfer $openApiRequestTransfer
      *
-     * @return \Generated\Shared\Transfer\OpenApiResponseTransfer
+     * @return \Transfer\OpenApiResponseTransfer
      */
     public function createOpenApi(OpenApiRequestTransfer $openApiRequestTransfer): OpenApiResponseTransfer
     {

diff --git a/src/SprykerSdk/SyncApi/OpenApi/Builder/OpenApiBuilderInterface.php b/src/SprykerSdk/SyncApi/OpenApi/Builder/OpenApiBuilderInterface.php
@@ -7,15 +7,15 @@
 
 namespace SprykerSdk\SyncApi\OpenApi\Builder;
 
-use Generated\Shared\Transfer\OpenApiRequestTransfer;
-use Generated\Shared\Transfer\OpenApiResponseTransfer;
+use Transfer\OpenApiRequestTransfer;
+use Transfer\OpenApiResponseTransfer;
 
 interface OpenApiBuilderInterface
 {
     /**
-     * @param \Generated\Shared\Transfer\OpenApiRequestTransfer $openApiRequestTransfer
+     * @param \Transfer\OpenApiRequestTransfer $openApiRequestTransfer
      *
-     * @return \Generated\Shared\Transfer\OpenApiResponseTransfer
+     * @return \Transfer\OpenApiResponseTransfer
      */
     public function createOpenApi(OpenApiRequestTransfer $openApiRequestTransfer): OpenApiResponseTransfer;
 }