From f2bf9ee51f56c522124ecc886cf05caf9dc4e7ac Mon Sep 17 00:00:00 2001 From: Maxime BONGIORNO Date: Tue, 3 Jul 2018 18:02:33 +0200 Subject: [PATCH 1/2] add port support in PIM source and destination URL - FIX #70 --- .../S015FromSourcePimConfiguredToSourcePimApiConfigured.php | 2 +- ...050FromDestinationPimDownloadedToDestinationPimInstalled.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Infrastructure/MigrationStep/S015FromSourcePimConfiguredToSourcePimApiConfigured.php b/src/Infrastructure/MigrationStep/S015FromSourcePimConfiguredToSourcePimApiConfigured.php index c244001..7811512 100644 --- a/src/Infrastructure/MigrationStep/S015FromSourcePimConfiguredToSourcePimApiConfigured.php +++ b/src/Infrastructure/MigrationStep/S015FromSourcePimConfiguredToSourcePimApiConfigured.php @@ -71,7 +71,7 @@ private function askForBaseUri(string $defaultResponse): string $validator = function ($answer) { // This URI validation regex is intentionally imperfect. // It's goal is only to avoid common mistakes like forgetting "http", or adding parameters from a copy/paste. - if (0 === preg_match('~^https?:\/\/[a-z0-9]+[a-z0-9\-\.]*[a-z0-9]+\/?$~i', $answer)) { + if (0 === preg_match('~^https?:\/\/[a-z0-9]+[a-z0-9\-\.]*[a-z0-9]+\/?(?:\:?\d{1,4})?$~i', $answer)) { throw new \RuntimeException( $this->translator->trans( 'from_source_pim_configured_to_source_pim_api_configured.on_source_pim_api_configuration.base_uri.error_message' diff --git a/src/Infrastructure/MigrationStep/S050FromDestinationPimDownloadedToDestinationPimInstalled.php b/src/Infrastructure/MigrationStep/S050FromDestinationPimDownloadedToDestinationPimInstalled.php index 074485d..c479340 100644 --- a/src/Infrastructure/MigrationStep/S050FromDestinationPimDownloadedToDestinationPimInstalled.php +++ b/src/Infrastructure/MigrationStep/S050FromDestinationPimDownloadedToDestinationPimInstalled.php @@ -168,7 +168,7 @@ public function onDestinationPimApiConfiguration(Event $event) function ($answer) { // This URI validation regex is intentionally imperfect. // It's goal is only to avoid common mistakes like forgetting "http", or adding parameters from a copy/paste. - if (0 === preg_match('~^https?:\/\/[a-z0-9]+[a-z0-9\-\.]*[a-z0-9]+\/?$~i', $answer)) { + if (0 === preg_match('~^https?:\/\/[a-z0-9]+[a-z0-9\-\.]*[a-z0-9]+\/?(?:\:?\d{1,4})?$~i', $answer)) { throw new \RuntimeException( $this->translator->trans( 'from_destination_pim_downloaded_to_destination_pim_installed.on_destination_pim_api_configuration.base_uri.error_message' From 5c38ea2fc9f532f7b9f5d66f00c6a726fc35b022 Mon Sep 17 00:00:00 2001 From: Maxime BONGIORNO Date: Tue, 3 Jul 2018 18:08:30 +0200 Subject: [PATCH 2/2] remove optional statement on colon separator for port --- .../S015FromSourcePimConfiguredToSourcePimApiConfigured.php | 2 +- ...050FromDestinationPimDownloadedToDestinationPimInstalled.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Infrastructure/MigrationStep/S015FromSourcePimConfiguredToSourcePimApiConfigured.php b/src/Infrastructure/MigrationStep/S015FromSourcePimConfiguredToSourcePimApiConfigured.php index 7811512..235a7cd 100644 --- a/src/Infrastructure/MigrationStep/S015FromSourcePimConfiguredToSourcePimApiConfigured.php +++ b/src/Infrastructure/MigrationStep/S015FromSourcePimConfiguredToSourcePimApiConfigured.php @@ -71,7 +71,7 @@ private function askForBaseUri(string $defaultResponse): string $validator = function ($answer) { // This URI validation regex is intentionally imperfect. // It's goal is only to avoid common mistakes like forgetting "http", or adding parameters from a copy/paste. - if (0 === preg_match('~^https?:\/\/[a-z0-9]+[a-z0-9\-\.]*[a-z0-9]+\/?(?:\:?\d{1,4})?$~i', $answer)) { + if (0 === preg_match('~^https?:\/\/[a-z0-9]+[a-z0-9\-\.]*[a-z0-9]+\/?(?:\:\d{1,4})?$~i', $answer)) { throw new \RuntimeException( $this->translator->trans( 'from_source_pim_configured_to_source_pim_api_configured.on_source_pim_api_configuration.base_uri.error_message' diff --git a/src/Infrastructure/MigrationStep/S050FromDestinationPimDownloadedToDestinationPimInstalled.php b/src/Infrastructure/MigrationStep/S050FromDestinationPimDownloadedToDestinationPimInstalled.php index c479340..421be68 100644 --- a/src/Infrastructure/MigrationStep/S050FromDestinationPimDownloadedToDestinationPimInstalled.php +++ b/src/Infrastructure/MigrationStep/S050FromDestinationPimDownloadedToDestinationPimInstalled.php @@ -168,7 +168,7 @@ public function onDestinationPimApiConfiguration(Event $event) function ($answer) { // This URI validation regex is intentionally imperfect. // It's goal is only to avoid common mistakes like forgetting "http", or adding parameters from a copy/paste. - if (0 === preg_match('~^https?:\/\/[a-z0-9]+[a-z0-9\-\.]*[a-z0-9]+\/?(?:\:?\d{1,4})?$~i', $answer)) { + if (0 === preg_match('~^https?:\/\/[a-z0-9]+[a-z0-9\-\.]*[a-z0-9]+\/?(?:\:\d{1,4})?$~i', $answer)) { throw new \RuntimeException( $this->translator->trans( 'from_destination_pim_downloaded_to_destination_pim_installed.on_destination_pim_api_configuration.base_uri.error_message'