@@ -54,13 +54,13 @@ discard block |
||
54 | 54 | $this->output = array(); |
55 | 55 | $this->errors = array(); |
56 | 56 | |
57 | - $options = ' ' . trim($this->exeOptions) . ' '; |
|
57 | + $options = ' '.trim($this->exeOptions).' '; |
|
58 | 58 | |
59 | 59 | if (empty($this->exe)) { |
60 | 60 | $exeFinder = new PhpExecutableFinder(); |
61 | 61 | $foundExe = $exeFinder->find(); |
62 | 62 | if ($foundExe) { |
63 | - $this->exe = $foundExe . ' composer.phar'; |
|
63 | + $this->exe = $foundExe.' composer.phar'; |
|
64 | 64 | } else { |
65 | 65 | $this->errors[] = 'Cannot find PHP executable'; |
66 | 66 | return false; |
@@ -73,14 +73,14 @@ discard block |
||
73 | 73 | } |
74 | 74 | |
75 | 75 | set_time_limit(300); // don't want this script to timeout; |
76 | - $command = $this->exe . $options . $command_line; |
|
77 | - putenv('COMPOSER_HOME=' . \XoopsBaseConfig::get('var-path').'/composer'); |
|
76 | + $command = $this->exe.$options.$command_line; |
|
77 | + putenv('COMPOSER_HOME='.\XoopsBaseConfig::get('var-path').'/composer'); |
|
78 | 78 | $process = new Process($command); |
79 | 79 | //$process->setEnv(array('COMPOSER_HOME' => \XoopsBaseConfig::get('var-path').'/composer')); |
80 | 80 | $process->setTimeout(120); |
81 | 81 | try { |
82 | 82 | $process->run( |
83 | - function ($type, $buffer) use (&$errors, &$output) { |
|
83 | + function($type, $buffer) use (&$errors, &$output) { |
|
84 | 84 | if (Process::ERR === $type) { |
85 | 85 | $errors[] = $buffer; |
86 | 86 | } else { |
@@ -96,7 +96,7 @@ discard block |
||
96 | 96 | array_unshift($this->output, $process->getErrorOutput()); |
97 | 97 | return true; |
98 | 98 | } else { |
99 | - $this->errors[] = 'Failed: ' . $command; |
|
99 | + $this->errors[] = 'Failed: '.$command; |
|
100 | 100 | $this->errors[] = sprintf( |
101 | 101 | "Process exit code: %s, '%s'", |
102 | 102 | $process->getExitCode(), |
@@ -51,7 +51,7 @@ discard block |
||
51 | 51 | * Service Mode constant - Multiple mode where all located services will be |
52 | 52 | * dispatched in priority order. |
53 | 53 | */ |
54 | - const MODE_MULTIPLE = 8; |
|
54 | + const MODE_MULTIPLE = 8; |
|
55 | 55 | |
56 | 56 | /** |
57 | 57 | * Provider priorities |
@@ -252,12 +252,12 @@ discard block |
||
252 | 252 | } else { |
253 | 253 | $xoops = \Xoops::getInstance(); |
254 | 254 | $provider = new Provider($this, $service); |
255 | - $event = 'core.service.locate.' . $service; |
|
255 | + $event = 'core.service.locate.'.$service; |
|
256 | 256 | // locate service provider(s) |
257 | 257 | // In response to trigger message, the contract implementor should register() |
258 | 258 | $xoops->events()->triggerEvent($event, $provider); |
259 | 259 | // get reference to the list of providers and prioritize it. |
260 | - $registered=$provider->getRegistered(); |
|
260 | + $registered = $provider->getRegistered(); |
|
261 | 261 | if (count($registered)) { |
262 | 262 | $choices = isset($this->providerPrefs[$service]) ? $this->providerPrefs[$service] : array(); |
263 | 263 | foreach ($registered as $p) { |
@@ -49,7 +49,7 @@ |
||
49 | 49 | { |
50 | 50 | $this->value = $value; |
51 | 51 | $this->success = $success; |
52 | - if ($errorMessage!==null) { |
|
52 | + if ($errorMessage !== null) { |
|
53 | 53 | $this->addErrorMessage($errorMessage); |
54 | 54 | } |
55 | 55 | } |
@@ -70,11 +70,11 @@ discard block |
||
70 | 70 | */ |
71 | 71 | public function __construct(?string $filename = null, ?string $mimeType = null) |
72 | 72 | { |
73 | - if (null!==$filename) { |
|
73 | + if (null !== $filename) { |
|
74 | 74 | Assert::fileExists($filename, static::MESSAGE_FILE); |
75 | 75 | $this->filename = $filename; |
76 | 76 | } |
77 | - if (null!==$mimeType) { |
|
77 | + if (null !== $mimeType) { |
|
78 | 78 | Assert::regex($mimeType, static::MIME_REGEX, static::MESSAGE_MIME); |
79 | 79 | $this->mimeType = $mimeType; |
80 | 80 | } |
@@ -245,6 +245,6 @@ discard block |
||
245 | 245 | */ |
246 | 246 | public function getInlineAttribute() : bool |
247 | 247 | { |
248 | - return (bool) $this->inline; |
|
248 | + return (bool)$this->inline; |
|
249 | 249 | } |
250 | 250 | } |
@@ -54,7 +54,7 @@ |
||
54 | 54 | */ |
55 | 55 | public function __construct(?array $attachments = null) |
56 | 56 | { |
57 | - if (null!==$attachments) { |
|
57 | + if (null !== $attachments) { |
|
58 | 58 | Assert::allIsInstanceOf($attachments, EmailAttachment::class, static::MESSAGE_ATTACHMENT); |
59 | 59 | try { |
60 | 60 | /** @var EmailAttachment $attachment */ |
@@ -66,21 +66,21 @@ |
||
66 | 66 | */ |
67 | 67 | public function __construct(?string $subject = null, ?string $body = null, ?int $fromId = null, ?int $toId = null) |
68 | 68 | { |
69 | - if (null!==$subject) { |
|
69 | + if (null !== $subject) { |
|
70 | 70 | $subject = trim($subject); |
71 | 71 | Assert::stringNotEmpty($subject, static::MESSAGE_SUBJECT); |
72 | 72 | $this->subject = $subject; |
73 | 73 | } |
74 | - if (null!==$body) { |
|
74 | + if (null !== $body) { |
|
75 | 75 | $body = trim($body); |
76 | 76 | Assert::stringNotEmpty($body, static::MESSAGE_BODY); |
77 | 77 | $this->body = $body; |
78 | 78 | } |
79 | - if (null!==$fromId) { |
|
79 | + if (null !== $fromId) { |
|
80 | 80 | Assert::greaterThan($fromId, 0, static::MESSAGE_FROM); |
81 | 81 | $this->fromId = $fromId; |
82 | 82 | } |
83 | - if (null!==$toId) { |
|
83 | + if (null !== $toId) { |
|
84 | 84 | Assert::greaterThan($toId, 0, static::MESSAGE_TO); |
85 | 85 | $this->toId = $toId; |
86 | 86 | } |
@@ -53,7 +53,7 @@ |
||
53 | 53 | */ |
54 | 54 | public function __construct(?array $addresses = null) |
55 | 55 | { |
56 | - if (null!==$addresses) { |
|
56 | + if (null !== $addresses) { |
|
57 | 57 | Assert::allIsInstanceOf($addresses, EmailAddress::class, static::MESSAGE_ADDRESS); |
58 | 58 | try { |
59 | 59 | /** @var EmailAddress $address */ |
@@ -58,15 +58,15 @@ discard block |
||
58 | 58 | */ |
59 | 59 | public function __construct(?string $email = null, ?string $displayName = null) |
60 | 60 | { |
61 | - if (null!==$email) { |
|
61 | + if (null !== $email) { |
|
62 | 62 | $email = trim($email); |
63 | 63 | Assert::true( |
64 | - false!==filter_var($email, FILTER_VALIDATE_EMAIL, FILTER_FLAG_EMAIL_UNICODE), |
|
64 | + false !== filter_var($email, FILTER_VALIDATE_EMAIL, FILTER_FLAG_EMAIL_UNICODE), |
|
65 | 65 | static::MESSAGE_ADDRESS |
66 | 66 | ); |
67 | 67 | $this->email = $email; |
68 | 68 | } |
69 | - if (null!==$displayName) { |
|
69 | + if (null !== $displayName) { |
|
70 | 70 | $displayName = trim($displayName); |
71 | 71 | $displayName = empty($displayName) ? null : $displayName; |
72 | 72 | Assert::nullOrStringNotEmpty($displayName, static::MESSAGE_NAME); |
@@ -85,7 +85,7 @@ discard block |
||
85 | 85 | { |
86 | 86 | try { |
87 | 87 | Assert::true( |
88 | - false!==filter_var($this->email, FILTER_VALIDATE_EMAIL, FILTER_FLAG_EMAIL_UNICODE), |
|
88 | + false !== filter_var($this->email, FILTER_VALIDATE_EMAIL, FILTER_FLAG_EMAIL_UNICODE), |
|
89 | 89 | static::MESSAGE_ADDRESS |
90 | 90 | ); |
91 | 91 | } catch (\InvalidArgumentException $e) { |
@@ -115,22 +115,22 @@ |
||
115 | 115 | ?EmailAddress $fromAddress = null, |
116 | 116 | ?EmailAddress $toAddress = null |
117 | 117 | ) { |
118 | - if (null!==$subject) { |
|
118 | + if (null !== $subject) { |
|
119 | 119 | $subject = trim($subject); |
120 | 120 | Assert::stringNotEmpty($subject, static::MESSAGE_SUBJECT); |
121 | 121 | $this->subject = $subject; |
122 | 122 | } |
123 | - if (null!==$body) { |
|
123 | + if (null !== $body) { |
|
124 | 124 | $body = trim($body); |
125 | 125 | Assert::stringNotEmpty($body, static::MESSAGE_BODY); |
126 | 126 | $this->body = $body; |
127 | 127 | } |
128 | 128 | try { |
129 | - if (null!==$fromAddress) { |
|
129 | + if (null !== $fromAddress) { |
|
130 | 130 | $fromAddress->getEmail(); |
131 | 131 | $this->fromAddress = $fromAddress; |
132 | 132 | } |
133 | - if (null!==$toAddress) { |
|
133 | + if (null !== $toAddress) { |
|
134 | 134 | $toAddress->getEmail(); |
135 | 135 | $this->toAddresses = new EmailAddressList([$toAddress]); |
136 | 136 | } |