Merge remote-tracking branch 'origin/3.5.x' into 3.5.x

Author: Seiger

assets/modules/store/core.php

@@ -44,7 +44,7 @@
 		}
 	} else {
 		$extension = pathinfo($_FILES['install_file']['name'], PATHINFO_EXTENSION);
-		if( !in_array($extension, array('zip'))) {
+		if( !in_array($extension, ['zip'])) {
 			die('Only ZIP-Files allowed');
 		}
 		if (!move_uploaded_file($_FILES['install_file']['tmp_name'], MODX_BASE_PATH."assets/cache/store/temp.zip")) {
@@ -154,7 +154,7 @@
 
 default:
 	//prepare list of snippets
-	$types = array('snippets','plugins','modules');
+	$types = ['snippets','plugins','modules'];
     $snippets = \EvolutionCMS\Models\SiteSnippet::query()->get();
     foreach ($snippets as $snippet){
         $PACK[$value][$snippet->name]= $Store->get_version($snippet->description) ;

assets/plugins/codemirror/codemirror.plugin.php

@@ -130,10 +130,10 @@
     case 'OnTVFormRender':
 		$tvMode = true;
 		// $limitedHeight = true; // No limited height since MODX 1.2
-		$elements = array(
+		$elements = [
 			$textarea_name,
 			'properties'
-		);
+		];
 		$mode = 'application/x-httpd-php-open';
 		$rte = ($prte ? $prte : 'none');
 		$lang = "php";
@@ -331,7 +331,7 @@ function makeMarker(symbol) {
 }
 
 if(!$tvMode) {
-	$elements = array($textarea_name);
+	$elements = [$textarea_name];
 }
 
 if(('none' == $rte) && $mode && $elements !== NULL) {

assets/plugins/extrascheck/CheckOutdated.class.php

@@ -27,7 +27,7 @@ class CheckOutdated
      * @param string $pluginName
      * @param array $lang
      */
-    public function __construct($modx, $pluginName, $lang = array())
+    public function __construct($modx, $pluginName, $lang = [])
     {
         $this->modx = $modx;
         $this->pluginName = $pluginName;
@@ -54,7 +54,7 @@ public function load($source)
             $data = json_decode($data, true);
         }
 
-        return \is_array($data) ? $data : array();
+        return \is_array($data) ? $data : [];
     }
 
     /**
@@ -92,15 +92,15 @@ public function snippet($name, $options)
             if (version_compare($currentVersion, $minVersion, 'lt')) {
                 $out .= $this->parseTemplate(
                     $tpl,
-                    array(
+                    [
                         'name' => $snippet->name,
                         'replaced' => $replaced,
                         'isSecurity' => $isSecurity,
                         'minVersion' => $minVersion,
                         'currentVersion' => $currentVersion,
                         'extrasID' => $this->getExtrasId(),
                         'extrasURL' => $this->getExtrasUrl($snippet->name)
-                    )
+                    ]
                 );
             }
 
@@ -144,15 +144,15 @@ public function plugin($name, $options)
             if (version_compare($currentVersion, $minVersion, 'lt')) {
                 $out .= $this->parseTemplate(
                     $tpl,
-                    array(
+                    [
                         'name' => $plugin->name,
                         'replaced' => $replaced,
                         'isSecurity' => $isSecurity,
                         'minVersion' => $minVersion,
                         'currentVersion' => $currentVersion,
                         'extrasID' => $this->getExtrasId(),
                         'extrasURL' => $this->getExtrasUrl($plugin->name)
-                    )
+                    ]
                 );
             }
         }
@@ -194,15 +194,15 @@ public function module($name, $options)
                 if (version_compare($currentVersion, $minVersion, 'lt')) {
                     $out .= $this->parseTemplate(
                         $tpl,
-                        array(
+                        [
                             'name' => $module->name,
                             'replaced' => $replaced,
                             'isSecurity' => $isSecurity,
                             'minVersion' => $minVersion,
                             'currentVersion' => $currentVersion,
                             'extrasID' => $this->getExtrasId(),
                             'extrasURL' => $this->getExtrasUrl($module->name)
-                        )
+                        ]
                     );
                 }
             }
@@ -216,7 +216,7 @@ public function module($name, $options)
      * @param array $options
      * @return string
      */
-    public function file($path, $options = array())
+    public function file($path, $options = [])
     {
         $out = '';
         if (file_exists(MODX_BASE_PATH . $path)) {
@@ -241,7 +241,7 @@ public function file($path, $options = array())
      * @param array $options
      * @return string
      */
-    public function theme($theme, $options = array())
+    public function theme($theme, $options = [])
     {
         $out = '';
         if (file_exists(MODX_MANAGER_PATH . 'media/style/' . $theme)) {
@@ -257,11 +257,11 @@ public function theme($theme, $options = array())
 
             $out = $this->parseTemplate(
                 $tpl,
-                array(
+                [
                     'theme' => $theme,
                     'isSecurity' => $isSecurity,
                     'path' => MODX_MANAGER_PATH . 'media/style/'
-                )
+                ]
             );
         }
 
@@ -288,10 +288,10 @@ public function rss($key, $options)
 
             $out = $this->parseTemplate(
                 $tpl,
-                array(
+                [
                     'extrasID' => $this->getExtrasId(),
                     'oldUrl' => $options['old']
-                )
+                ]
             );
         }
 
@@ -361,7 +361,7 @@ public function makeConfigButton($title)
     {
         $button = '';
         if ($this->modx->hasPermission('edit_plugin')) {
-            $popup = array(
+            $popup = [
                 'url' => MODX_MANAGER_URL . '?a=102&id=' . $this->getPluginId() . '&tab=1',
                 'title1' => $title,
                 'icon' => 'fa-cog',
@@ -374,7 +374,7 @@ public function makeConfigButton($title)
                 'hover' => 0,
                 'overlay' => 1,
                 'overlayclose' => 1
-            );
+            ];
 
             $button = '<a ' .
                     'data-toggle="tooltip" ' .
@@ -395,7 +395,7 @@ public function makeConfigButton($title)
     /**
      * @param array $lexicon
      */
-    public function setLang($lexicon = array())
+    public function setLang($lexicon = [])
     {
         $lang = $this->modx->getConfig('manager_language');
         if (file_exists( __DIR__ .  '/lang/'.$lang.'/core.inc.php')){
@@ -424,7 +424,7 @@ public function setLang($lexicon = array())
      */
     public function process($type, $item, $options)
     {
-        $available = array('rss', 'file', 'theme', 'snippet', 'plugin', 'module');
+        $available = ['rss', 'file', 'theme', 'snippet', 'plugin', 'module'];
 
         if (\in_array($type, $available) && method_exists($this, $type)) {
             $out = $this->{$type}($item, $options);
@@ -437,12 +437,12 @@ public function process($type, $item, $options)
      * @param array $data
      * @return string
      */
-    public function parseTemplate($tpl, $data = array())
+    public function parseTemplate($tpl, $data = [])
     {
         return $this->tpl->parseChunk(
             ($tpl),
             array_merge(
-                array('evo_cms_version' => $this->modx->getVersionData('version')),
+                ['evo_cms_version' => $this->modx->getVersionData('version')],
                 $data,
                 $this->lang
             ),

assets/plugins/extrascheck/OutdatedExtrasCheck.plugin.php

@@ -47,7 +47,7 @@
             $modx->setPlaceholder('button_pl_config', $button);
 
             $wdgTitle = $checkOutdated->parseTemplate('@CODE:EVO [+evo_cms_version+] - [+title+]');
-            $widgets['xtraCheck'] = array(
+            $widgets['xtraCheck'] = [
                 'menuindex' => '0',
                 'id'        => 'xtraCheck' . $checkOutdated->getPluginId() . '',
                 'cols'      => 'col-lg-12',
@@ -57,7 +57,7 @@
                 'title'     => '' . $wdgTitle . ' ' . $button . '',
                 'body'      => '<div class="card-body">' . $out . '</div>',
                 'hide'      => '0'
-            );
+            ];
             $modx->event->setOutput(serialize($widgets));
         }
         break;

assets/plugins/extrascheck/lang/english/core.inc.php

@@ -11,7 +11,7 @@
 //
 //   GNU General Public License (GPL - http://www.gnu.org/copyleft/gpl.html)
 //
-$_lang = array();
+$_lang = [];
 
 $_lang['title'] = 'Extras compatibility check';
 $_lang['outdated'] = 'is <b>outdated</b>';

assets/plugins/extrascheck/lang/italian/core.inc.php

@@ -11,7 +11,7 @@
 //
 //   GNU General Public License (GPL - http://www.gnu.org/copyleft/gpl.html)
 //
-$_lang = array();
+$_lang = [];
 
 $_lang['title'] = 'Controllo Compatibilità Extras';
 $_lang['outdated'] = 'è <b>obsoleto</b>';

assets/plugins/extrascheck/lang/russian-UTF8/core.inc.php

@@ -11,7 +11,7 @@
 //
 //   GNU General Public License (GPL - http://www.gnu.org/copyleft/gpl.html)
 //
-$_lang = array();
+$_lang = [];
 
 $_lang['title'] = 'Проверка совместимости дополнений';
 $_lang['outdated'] = '<b>устаревший</b>';

assets/plugins/extrascheck/lang/spanish/core.inc.php

@@ -11,7 +11,7 @@
 //
 //   GNU General Public License (GPL - http://www.gnu.org/copyleft/gpl.html)
 //
-$_lang = array();
+$_lang = [];
 $_lang['title'] = 'Comprobación de compatibilidad de extras';
 $_lang['outdated'] = 'está <b> obsoleto</b>';
 $_lang['isoutdated'] = 'está <b> obsoleto</b> y ya no es compatible con';

assets/plugins/transalias/transalias.class.php

@@ -24,7 +24,7 @@ class TransAlias {
      * @var array
      * @access
      */
-    var $_tables = array ('named' => array (
+    var $_tables = ['named' => [
             'quot' => '"','amp' => '&','lt' => '<','gt' => '>','OElig' => 'Œ','oelig' => 'œ','Scaron' => 'Š','scaron' => 'š',
             'Yuml' => 'Ÿ','circ' => 'ˆ','tilde' => '˜','ensp' => ' ','emsp' => ' ','thinsp' => ' ','zwnj' => '‌','zwj' => '‍',
             'lrm' => '‎','rlm' => '‏','ndash' => '–','mdash' => '—','lsquo' => '‘','rsquo' => '’','sbquo' => '‚','ldquo' => '“',
@@ -57,7 +57,7 @@ class TransAlias {
             'igrave' => 'ì','iacute' => 'í','icirc' => 'î','iuml' => 'ï','eth' => 'ð','ntilde' => 'ñ','ograve' => 'ò','oacute' => 'ó',
             'ocirc' => 'ô','otilde' => 'õ','ouml' => 'ö','divide' => '÷','oslash' => 'ø','ugrave' => 'ù','uacute' => 'ú','ucirc' => 'û',
             'uuml' => 'ü','yacute' => 'ý','thorn' => 'þ','yuml' => 'ÿ'
-    ));
+    ]];
 
     /**
      * Swap named HTML entities with numeric entities.
@@ -105,7 +105,7 @@ function convert_numeric_entity($matches) {
      */
     function getTVValue($tv) {
         global $modx;
-        $additionalEncodings = array('-' => '%2D', '.' => '%2E', '_' => '%5F');
+        $additionalEncodings = ['-' => '%2D', '.' => '%2E', '_' => '%5F'];
         $tvname = str_replace(array_keys($additionalEncodings), array_values($additionalEncodings), rawurlencode($tv));
         if(array_key_exists('tv'.$tvname, $_POST)) {
             include_once MODX_MANAGER_PATH . 'includes/tmplvars.commands.inc.php';
@@ -168,11 +168,11 @@ function loadTable($name, $remove_periods = 'No') {
      */
     function stripAlias($alias,$char_restrict,$word_separator) {
         // Convert all named HTML entities to numeric entities
-        $alias = preg_replace_callback('/&([a-zA-Z][a-zA-Z0-9]{1,7});/', array($this,'convert_entity'), $alias);
+        $alias = preg_replace_callback('/&([a-zA-Z][a-zA-Z0-9]{1,7});/', [$this,'convert_entity'], $alias);
 
         // Convert all numeric entities to their actual character
-        $alias = preg_replace_callback('/&#x([0-9a-f]{1,7});/i', array($this, 'convert_hex_entity'), $alias);
-        $alias = preg_replace_callback('/&#([0-9]{1,7});/', array($this, 'convert_numeric_entity'), $alias);
+        $alias = preg_replace_callback('/&#x([0-9a-f]{1,7});/i', [$this, 'convert_hex_entity'], $alias);
+        $alias = preg_replace_callback('/&#([0-9]{1,7});/', [$this, 'convert_numeric_entity'], $alias);
 
         if (class_exists('Normalizer')) {
             $alias = Normalizer::normalize($alias);

assets/plugins/transalias/transliterations/common.php

@@ -2,7 +2,7 @@
 /**
  * Common transliteration table
  */
-return array(
+return [
     '&' => 'and', '%' => '', '\'' => '',
     'À' => 'A', 'Á' => 'A', 'Â' => 'A', 'Ã' => 'A', 'Ä' => 'A', 'Å' => 'A', 'Æ' => 'E', 'Ā' => 'A', 'Ą' => 'A', 'Ă' => 'A',
     'Ç' => 'C', 'Ć' => 'C', 'Č' => 'C', 'Ĉ' => 'C', 'Ċ' => 'C',
@@ -51,4 +51,4 @@
     'ζ' => 'z', 'η' => 'i', 'ή' => 'i', 'θ' => 'th', 'ι' => 'i', 'ί' => 'i', 'ϊ' => 'i', 'ΐ' => 'i', 'κ' => 'k', 'λ' => 'l',
     'μ' => 'm', 'ν' => 'n', 'ξ' => 'ks', 'ο' => 'o', 'ό' => 'o', 'π' => 'p', 'ρ' => 'r', 'σ' => 's', 'τ' => 't', 'υ' => 'y',
     'ύ' => 'y', 'ϋ' => 'y', 'ΰ' => 'y', 'φ' => 'f', 'χ' => 'x', 'ψ' => 'ps', 'ω' => 'o', 'ώ' => 'o'
-);
+];