fix: disable php-scoper (#285)

PrestaShopCorp · Apr 18, 2024 · bfc4647 · bfc4647
1 parent 53adaa4
commit bfc4647
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 178 deletions.
diff --git a/.gitignore b/.gitignore
@@ -16,7 +16,6 @@ composer.phar
 .php_cs
 install.lock
 composer-setup.php
-php-scoper.phar
 
 # Mac OS
 .DS_Store

diff --git a/Makefile b/Makefile
@@ -7,7 +7,6 @@ PHP_VERSION ?= 8.1
 PS_VERSION ?= 8.1.3
 TESTING_IMAGE ?= prestashop/prestashop-flashlight:${PS_VERSION}
 PS_ROOT_DIR ?= $(shell pwd)/prestashop/prestashop-${PS_VERSION}
-PHP_SCOPER_DIR=php-scoper
 
 export PHP_CS_FIXER_IGNORE_ENV = 1
 export _PS_ROOT_DIR_ ?= ${PS_ROOT_DIR}
@@ -22,14 +21,12 @@ endef
 
 define create_module
 	$(eval TMP_DIR := $(shell mktemp -d))
-	mkdir -p ${TMP_DIR}/tmp;
-	cp -r $(shell cat .zip-contents) ${TMP_DIR}/tmp;
-	VERSION=${PACKAGE} TMP_FOLDER=${TMP_DIR}/tmp php php-scoper.phar add-prefix --output-dir=${TMP_DIR}/${MODULE_NAME} --force
+	mkdir -p ${TMP_DIR}/${MODULE_NAME};
+	cp -r $(shell cat .zip-contents) ${TMP_DIR}/${MODULE_NAME};
 	$(call replace_version,${TMP_DIR}/${MODULE_NAME},${SEM_VERSION})
 	./tools/vendor/bin/autoindex prestashop:add:index ${TMP_DIR}
 	cp $1 ${TMP_DIR}/${MODULE_NAME}/config/parameters.yml
 	cd ${TMP_DIR}/${MODULE_NAME} && composer dump-autoload
-	SCOPER_FOLDER=${TMP_DIR}/${MODULE_NAME} php php-scoper-fix.php
 
 	echo ${TMP_DIR}
 endef
@@ -83,22 +80,22 @@ zip: zip-prod zip-inte zip-e2e
 
 # target: zip-e2e                                              - Bundle a local E2E integrable zip
 .PHONY: zip-e2e
-zip-e2e: php-scoper.phar vendor tools/vendor dist
+zip-e2e: vendor tools/vendor dist
 	@$(call zip_it,./config/parameters.yml,${PACKAGE}_e2e.zip)
 
 # target: zip-inte                                             - Bundle an integration zip
 .PHONY: zip-inte
-zip-inte: php-scoper.phar vendor tools/vendor dist
+zip-inte: vendor tools/vendor dist
 	@$(call zip_it,.config.inte.yml,${PACKAGE}_integration.zip)
 
 # target: zip-prod                                             - Bundle a production zip
 .PHONY: zip-prod
-zip-prod: php-scoper.phar vendor tools/vendor dist
+zip-prod: vendor tools/vendor dist
 	@$(call zip_it,.config.prod.yml,${PACKAGE}.zip)
 
 # target: zip-unzipped                                          - Bundle a production module, but without zip step (only to check sources)
 .PHONY: zip-unzipped
-zip-unzipped: php-scoper.phar vendor tools/vendor dist
+zip-unzipped: vendor tools/vendor dist
 	@$(call no_zip_it,.config.prod.yml)
 
 # target: build                                                - Setup PHP & Node.js locally
@@ -209,9 +206,6 @@ phpstan-baseline: prestashop/prestashop-${PS_VERSION} phpstan
 .PHONY: docker-test
 docker-test: docker-lint docker-phpstan docker-phpunit
 
-php-scoper.phar:
-	@php -r "copy('https://github.com/humbug/php-scoper/releases/latest/download/php-scoper.phar', 'php-scoper.phar');";
-
 define COMMENT
 	Fixme: add "allure-framework/allure-phpunit" in composer.json to solve this.
 	Currently failing to resolve devDeps:

diff --git a/php-scoper-fix.php b/php-scoper-fix.php
diff --git a/ps_eventbus.php b/ps_eventbus.php
@@ -1581,7 +1581,7 @@ private function insertIncrementalSyncObject($objectId, $type, $date, $shopId, $
         /** @var EventbusSyncRepository $eventbusSyncRepository */
         $eventbusSyncRepository = $this->getService(EventbusSyncRepository::class);
 
-        /**
+        /*
          * randomly check if outbox for this shop-content contain more of 100k entries.
          * When random number == 10, we count number of entry exist in database for this specific shop content
          * If count > 100 000, we removed all entry corresponding to this shop content, and we enable full sync for this
@@ -1639,7 +1639,7 @@ private function insertDeletedObject($objectId, $type, $date, $shopId)
         if ((int) $objectId === 0) {
             return;
         }
-        
+
         /** @var DeletedObjectsRepository $deletedObjectsRepository */
         $deletedObjectsRepository = $this->getService(DeletedObjectsRepository::class);
 

diff --git a/scoper.inc.php b/scoper.inc.php
diff --git a/src/Repository/IncrementalSyncRepository.php b/src/Repository/IncrementalSyncRepository.php
@@ -3,7 +3,6 @@
 namespace PrestaShop\Module\PsEventbus\Repository;
 
 use PrestaShop\Module\PsEventbus\Handler\ErrorHandler\ErrorHandlerInterface;
-use PrestaShopDatabaseException;
 
 class IncrementalSyncRepository
 {
@@ -159,25 +158,28 @@ public function removeIncrementalSyncObject($type, $objectId)
     }
 
     /**
-     * @param string $type 
+     * @param string $type
+     *
      * @return int
      */
-    public function getIncrementalSyncObjectCountByType($type) {
+    public function getIncrementalSyncObjectCountByType($type)
+    {
         $query = new \DbQuery();
 
         $query->select('COUNT(type) as count')
             ->from(self::INCREMENTAL_SYNC_TABLE)
             ->where('type = "' . psql($type) . '"');
-        
-        return (int) $this->db->getValue($query); 
+
+        return (int) $this->db->getValue($query);
     }
 
     /**
-     * 
-     * @param string $type 
-     * @return bool 
+     * @param string $type
+     *
+     * @return bool
      */
-    public function removeIncrementaSyncObjectByType($type) {
+    public function removeIncrementaSyncObjectByType($type)
+    {
         return $this->db->delete(
             self::INCREMENTAL_SYNC_TABLE,
             'type = "' . pSQL($type) . '"'