EspoCRM – Open Source CRM Application
PHP calendarcontactscrmcrm-platformcrm-systemcustomer-portalcustomer-supportcustomizabledocumentsemail-marketingkanbanleadsopen-sourcephpplatformsales-automationsingle-page-applicationsupport
Remove double semicolons (#3345)
SuchAFuriousDeatha41374ef7415
diff --git a/application/Espo/Core/Formula/AttributeFetcher.php b/application/Espo/Core/Formula/AttributeFetcher.phpindex bdee8f6b02..ed89ef8114 100644--- a/application/Espo/Core/Formula/AttributeFetcher.php+++ b/application/Espo/Core/Formula/AttributeFetcher.php@@ -136,7 +136,7 @@ class AttributeFetcher$data = $emailAddressRepository->getEmailAddressData($entity);$entity->set($attribute, $data);- $entity->setFetched($attribute, $data);;+ $entity->setFetched($attribute, $data);return;}@@ -155,7 +155,7 @@ class AttributeFetcher$data = $phoneNumberRepository->getPhoneNumberData($entity);$entity->set($attribute, $data);- $entity->setFetched($attribute, $data);;+ $entity->setFetched($attribute, $data);return;}diff --git a/application/Espo/Core/Utils/Database/DetailsProviders/MysqlDetailsProvider.php b/application/Espo/Core/Utils/Database/DetailsProviders/MysqlDetailsProvider.phpindex 1093b86ea0..fe1e7ec443 100644--- a/application/Espo/Core/Utils/Database/DetailsProviders/MysqlDetailsProvider.php+++ b/application/Espo/Core/Utils/Database/DetailsProviders/MysqlDetailsProvider.php@@ -70,7 +70,7 @@ class MysqlDetailsProvider implements DetailsProviderpublic function getParam(string $name): ?string{- $sql = "SHOW VARIABLES LIKE :param";;+ $sql = "SHOW VARIABLES LIKE :param";$sth = $this->pdo->prepare($sql);$sth->execute([':param' => $name]);diff --git a/application/Espo/Core/Utils/Database/DetailsProviders/PostgresqlDetailsProvider.php b/application/Espo/Core/Utils/Database/DetailsProviders/PostgresqlDetailsProvider.phpindex 2bef50b718..051e0a734c 100644--- a/application/Espo/Core/Utils/Database/DetailsProviders/PostgresqlDetailsProvider.php+++ b/application/Espo/Core/Utils/Database/DetailsProviders/PostgresqlDetailsProvider.php@@ -62,7 +62,7 @@ class PostgresqlDetailsProvider implements DetailsProviderpublic function getParam(string $name): ?string{- $name = preg_replace('/[^A-Za-z0-9_]+/', '', $name);;+ $name = preg_replace('/[^A-Za-z0-9_]+/', '', $name);$sql = "SHOW {$name}";diff --git a/application/Espo/Hooks/Common/Formula.php b/application/Espo/Hooks/Common/Formula.phpindex c9450ed418..ffc8ce0c20 100644--- a/application/Espo/Hooks/Common/Formula.php+++ b/application/Espo/Hooks/Common/Formula.php@@ -63,7 +63,7 @@ class Formula implements BeforeSave$variables = (object) [];foreach ($scriptList as $script) {- $this->runScript($script, $entity, $variables);;+ $this->runScript($script, $entity, $variables);}$customScript = $this->metadata->get(['formula', $entity->getEntityType(), 'beforeSaveCustomScript']);@@ -72,7 +72,7 @@ class Formula implements BeforeSavereturn;}- $this->runScript($customScript, $entity, $variables);;+ $this->runScript($customScript, $entity, $variables);}private function runScript(string $script, Entity $entity, stdClass $variables): voiddiff --git a/application/Espo/Modules/Crm/Jobs/SubmitPopupReminders.php b/application/Espo/Modules/Crm/Jobs/SubmitPopupReminders.phpindex 17ac26f8c1..4146676269 100644--- a/application/Espo/Modules/Crm/Jobs/SubmitPopupReminders.php+++ b/application/Espo/Modules/Crm/Jobs/SubmitPopupReminders.php@@ -148,7 +148,7 @@ class SubmitPopupReminders implements JobDataLess$dateField . 'Date' => $entity->get($dateField . 'Date'),],],- ];;+ ];$reminder->set('isSubmitted', true);diff --git a/tests/integration/Espo/ORM/QueryTest.php b/tests/integration/Espo/ORM/QueryTest.phpindex 2ddc0261b9..d7e07f1417 100644--- a/tests/integration/Espo/ORM/QueryTest.php+++ b/tests/integration/Espo/ORM/QueryTest.php@@ -38,7 +38,7 @@ class QueryTest extends \tests\integration\Core\BaseTestCase$entityManager = $app->getContainer()->get('entityManager');$account = $entityManager->getEntity('Account');- $account->set('name', 'Test');;+ $account->set('name', 'Test');$entityManager->saveEntity($account);$query = $entityManager->getQueryBuilder()diff --git a/tests/integration/Espo/Record/DefaultsPopulatorTest.php b/tests/integration/Espo/Record/DefaultsPopulatorTest.phpindex 5212b4eef1..52af21b199 100644--- a/tests/integration/Espo/Record/DefaultsPopulatorTest.php+++ b/tests/integration/Espo/Record/DefaultsPopulatorTest.php@@ -77,7 +77,7 @@ class DefaultsPopulatorTest extends BaseTestCase], true);$this->auth('tester', null, $portal->getId());- $this->reCreateApplication();;+ $this->reCreateApplication();$service = $this->getContainer()->getByClass(ServiceContainer::class)->getByClass(CaseObj::class);diff --git a/tests/integration/Espo/Tools/WorkingTime/UtilityTest.php b/tests/integration/Espo/Tools/WorkingTime/UtilityTest.phpindex 47ca2b274d..6b21f758ad 100644--- a/tests/integration/Espo/Tools/WorkingTime/UtilityTest.php+++ b/tests/integration/Espo/Tools/WorkingTime/UtilityTest.php@@ -65,7 +65,7 @@ class UtilityTest extends BaseTestCase$configWriter = $this->getInjectableFactory()->create(ConfigWriter::class);$configWriter->set('workingTimeCalendarId', $calendar->getId());- $configWriter->save();;+ $configWriter->save();$utility = $this->getInjectableFactory()->create(CalendarUtilityFactory::class)diff --git a/tests/unit/Espo/Core/Formula/EvaluatorTest.php b/tests/unit/Espo/Core/Formula/EvaluatorTest.phpindex 894ff10eb1..4457059c0f 100644--- a/tests/unit/Espo/Core/Formula/EvaluatorTest.php+++ b/tests/unit/Espo/Core/Formula/EvaluatorTest.php@@ -1368,7 +1368,7 @@ class EvaluatorTest extends TestCase$this->evaluator->process($expression, null, $vars);- $this->assertEquals(2, $vars->a);;+ $this->assertEquals(2, $vars->a);}public function testSemicolonAndParentheses1(): void