Prefer usage of && operator instead of "and" (#530)

paulvandenburg · webflo · commit 53f6910c35db · 2019-11-08T22:52:47.000+01:00
diff --git a/scripts/composer/ScriptHandler.php b/scripts/composer/ScriptHandler.php
@@ -36,7 +36,7 @@ public static function createRequiredFiles(Event $event) {
     }
 
     // Prepare the settings file for installation
-    if (!$fs->exists($drupalRoot . '/sites/default/settings.php') and $fs->exists($drupalRoot . '/sites/default/default.settings.php')) {
+    if (!$fs->exists($drupalRoot . '/sites/default/settings.php') && $fs->exists($drupalRoot . '/sites/default/default.settings.php')) {
       $fs->copy($drupalRoot . '/sites/default/default.settings.php', $drupalRoot . '/sites/default/settings.php');
       require_once $drupalRoot . '/core/includes/bootstrap.inc';
       require_once $drupalRoot . '/core/includes/install.inc';

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public static function createRequiredFiles(Event $event) {`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`// Prepare the settings file for installation`
`39`		`- if (!$fs->exists($drupalRoot . '/sites/default/settings.php') and $fs->exists($drupalRoot . '/sites/default/default.settings.php')) {`
	`39`	`+ if (!$fs->exists($drupalRoot . '/sites/default/settings.php') && $fs->exists($drupalRoot . '/sites/default/default.settings.php')) {`
`40`	`40`	`$fs->copy($drupalRoot . '/sites/default/default.settings.php', $drupalRoot . '/sites/default/settings.php');`
`41`	`41`	`require_once $drupalRoot . '/core/includes/bootstrap.inc';`
`42`	`42`	`require_once $drupalRoot . '/core/includes/install.inc';`