@@ -145,8 +145,7 @@ |
||
| 145 | 145 | list($major, $minor, $patch) = $sem_ver; |
| 146 | 146 | |
| 147 | 147 | $tag = "$major.$minor$patch"; |
| 148 | - } |
|
| 149 | - else { |
|
| 148 | + } else { |
|
| 150 | 149 | preg_match('/\d+\.x-\d+\.0/', $tag, $match); |
| 151 | 150 | $tag = str_replace($match, str_replace('x-', NULL, $match), $tag); |
| 152 | 151 | preg_match('/\d+\.\d+\.0/', $tag, $match); |
@@ -27,7 +27,7 @@ discard block |
||
| 27 | 27 | $bin_dir = $composer->getConfig()->get('bin-dir'); |
| 28 | 28 | $make = NULL; |
| 29 | 29 | $executor = new ProcessExecutor(); |
| 30 | - $executor->execute($bin_dir . '/drush make-convert composer.lock', $make); |
|
| 30 | + $executor->execute($bin_dir.'/drush make-convert composer.lock', $make); |
|
| 31 | 31 | $make = Yaml::parse($make); |
| 32 | 32 | |
| 33 | 33 | // Include any drupal-library packages in the make file. |
@@ -37,7 +37,7 @@ discard block |
||
| 37 | 37 | ->getPackages(); |
| 38 | 38 | |
| 39 | 39 | // Retrieve a list of all libraries. |
| 40 | - $libraries = array_filter($libraries, function (PackageInterface $package) { |
|
| 40 | + $libraries = array_filter($libraries, function(PackageInterface $package) { |
|
| 41 | 41 | return in_array($package->getType(), array('drupal-library', 'bower-asset', 'npm-asset')); |
| 42 | 42 | }); |
| 43 | 43 | |
@@ -28,7 +28,7 @@ |
||
| 28 | 28 | /** @var \Composer\Package\Link $package */ |
| 29 | 29 | foreach ($patched_dependencies as $package) { |
| 30 | 30 | if (static::packageIsUnpinned($package)) { |
| 31 | - $error[] = $package->getTarget() . ': ' . $package->getPrettyConstraint(); |
|
| 31 | + $error[] = $package->getTarget().': '.$package->getPrettyConstraint(); |
|
| 32 | 32 | } |
| 33 | 33 | } |
| 34 | 34 | if (!empty($error)) { |
@@ -35,8 +35,7 @@ |
||
| 35 | 35 | array_unshift($error, 'The following dependencies are patched but don\'t have pinned dependency constraints:'); |
| 36 | 36 | $event->getIO()->writeError($error); |
| 37 | 37 | return FALSE; |
| 38 | - } |
|
| 39 | - else { |
|
| 38 | + } else { |
|
| 40 | 39 | $event->getIO()->write('Patched dependencies have constraints that are properly pinned.'); |
| 41 | 40 | } |
| 42 | 41 | } |
@@ -284,7 +284,7 @@ |
||
| 284 | 284 | } |
| 285 | 285 | else if ($referenced_entity instanceof MediaInterface) { |
| 286 | 286 | if ($depth < self::DEPTH_LIMIT && $file = $this->getFileFromEntity($referenced_entity)) { |
| 287 | - $return = $file; |
|
| 287 | + $return = $file; |
|
| 288 | 288 | } |
| 289 | 289 | } |
| 290 | 290 | } |
@@ -132,8 +132,7 @@ discard block |
||
| 132 | 132 | if ($this->getSetting('image_link')) { |
| 133 | 133 | $summary[] = $this->t('Thumbnail is linked to entity'); |
| 134 | 134 | } |
| 135 | - } |
|
| 136 | - else { |
|
| 135 | + } else { |
|
| 137 | 136 | $summary[] = $this->t('Please select a responsive image style.'); |
| 138 | 137 | } |
| 139 | 138 | |
@@ -227,8 +226,7 @@ discard block |
||
| 227 | 226 | if ($file = $this->getFileFromEntity($block_content)) { |
| 228 | 227 | return $file; |
| 229 | 228 | } |
| 230 | - } |
|
| 231 | - else if ($block instanceof EntityField) { |
|
| 229 | + } else if ($block instanceof EntityField) { |
|
| 232 | 230 | list (, $field_name) = explode(':', $block->getDerivativeId()); |
| 233 | 231 | if ($entity->hasField($field_name) && $field = $entity->get($field_name)) { |
| 234 | 232 | if ($file = $this->getFileFromField($field)) { |
@@ -281,8 +279,7 @@ discard block |
||
| 281 | 279 | $referenced_entity = reset($referenced_entities); |
| 282 | 280 | if ($referenced_entity instanceof FileInterface) { |
| 283 | 281 | $return = $referenced_entity; |
| 284 | - } |
|
| 285 | - else if ($referenced_entity instanceof MediaInterface) { |
|
| 282 | + } else if ($referenced_entity instanceof MediaInterface) { |
|
| 286 | 283 | if ($depth < self::DEPTH_LIMIT && $file = $this->getFileFromEntity($referenced_entity)) { |
| 287 | 284 | $return = $file; |
| 288 | 285 | } |