Merge remote-tracking branch 'origin/master'

.scrutinizer.yml

@@ -3,7 +3,7 @@ imports:
     - javascript
     - php
 filter:
-    excluded_paths: [js/jquery/*, js/jqplot/*, js/openlayers/*, js/codemirror/*, js/canvg/*, js/tracekit/*, js/sprintf.js]
+    excluded_paths: [js/vendor/*]
 build:
     dependencies:
         before:
@@ -12,7 +12,7 @@ build:
     tests:
         override:
             -
-                command: './vendor/bin/phpcs  --standard=PMAStandard ./ --report=checkstyle --report-file=cs-data --ignore=*/vendor/*,*/canvg/*,*/codemirror/*,*/openlayers/*,*/jquery/*,*/jqplot/*,*/build/*'
+                command: './vendor/bin/phpcs  --standard=PMAStandard ./ --report=checkstyle --report-file=cs-data --ignore=*/vendor/*,*/build/*'
                 analysis:
                     file: 'cs-data'                 # The reporter filename
                     format: 'php-cs-checkstyle'     # The supported format by Scrutinizer

build.xml

@@ -89,7 +89,7 @@
  <target name="phpcs" description="Generate checkstyle.xml using PHP_CodeSniffer excluding third party libraries" depends="phpcs-config">
   <exec executable="phpcs">
    <arg line="
-              --ignore=*/vendor/*,*/canvg/*,*/codemirror/*,*/openlayers/*,*/jquery/*,*/jqplot/*,*/build/*
+              --ignore=*/vendor/*,*/build/*
               --report=checkstyle
               --extensions=php
               --report-file='${basedir}/build/logs/checkstyle.xml'

db_central_columns.php

@@ -63,8 +63,8 @@ if (isset($_POST['add_column'])) {
 $response = Response::getInstance();
 $header = $response->getHeader();
 $scripts = $header->getScripts();
-$scripts->addFile('jquery/jquery.uitablefilter.js');
-$scripts->addFile('jquery/jquery.tablesorter.js');
+$scripts->addFile('vendor/jquery/jquery.uitablefilter.js');
+$scripts->addFile('vendor/jquery/jquery.tablesorter.js');
 $scripts->addFile('db_central_columns.js');
 $cfgCentralColumns = PMA_centralColumnsGetParams();
 $pmadb = $cfgCentralColumns['db'];

db_designer.php

@@ -120,7 +120,7 @@ $header   = $response->getHeader();
 $header->setBodyId('pmd_body');
 
 $scripts  = $header->getScripts();
-$scripts->addFile('jquery/jquery.fullscreen.js');
+$scripts->addFile('vendor/jquery/jquery.fullscreen.js');
 $scripts->addFile('pmd/designer_db.js');
 $scripts->addFile('pmd/designer_objects.js');
 $scripts->addFile('pmd/designer_page.js');

db_search.php

@@ -22,7 +22,7 @@ $scripts  = $header->getScripts();
 $scripts->addFile('db_search.js');
 $scripts->addFile('sql.js');
 $scripts->addFile('makegrid.js');
-$scripts->addFile('jquery/jquery-ui-timepicker-addon.js');
+$scripts->addFile('vendor/jquery/jquery-ui-timepicker-addon.js');
 
 require 'libraries/db_common.inc.php';
 

db_sql.php

@@ -24,7 +24,7 @@ $response = Response::getInstance();
 $header   = $response->getHeader();
 $scripts  = $header->getScripts();
 $scripts->addFile('makegrid.js');
-$scripts->addFile('jquery/jquery.uitablefilter.js');
+$scripts->addFile('vendor/jquery/jquery.uitablefilter.js');
 $scripts->addFile('sql.js');
 
 require 'libraries/db_common.inc.php';

db_tracking.php

@@ -20,7 +20,7 @@ require_once 'libraries/display_create_table.lib.php';
 $response = Response::getInstance();
 $header   = $response->getHeader();
 $scripts  = $header->getScripts();
-$scripts->addFile('jquery/jquery.tablesorter.js');
+$scripts->addFile('vendor/jquery/jquery.tablesorter.js');
 $scripts->addFile('db_tracking.js');
 
 /**

doc/copyright.rst

@@ -34,9 +34,9 @@ Third party licenses
 phpMyAdmin includes several third party libraries which come under their
 respective licenses.
 
-jQuery's license, which is where we got the files under js/jquery/ is
+jQuery's license, which is where we got the files under js/vendor/jquery/ is
 (MIT|GPL), a copy of each license is available in this repository (GPL
-is available as LICENSE, MIT as js/jquery/MIT-LICENSE.txt).
+is available as LICENSE, MIT as js/vendor/jquery/MIT-LICENSE.txt).
 
 The download kit additionally includes several composer libraries. See their
 licensing information in the vendor/ directory.

doc/faq.rst

@@ -685,13 +685,13 @@ A list of files and corresponding functionality which degrade gracefully when re
 * :file:`./vendor/tecnickcom/tcpdf` folder (exporting to PDF)
 * :file:`./locale/` folder, or unused subfolders (interface translations)
 * Any unused themes in :file:`./themes/`
-* :file:`./js/jquery/src/` (included for licensing reasons)
+* :file:`./js/vendor/jquery/src/` (included for licensing reasons)
 * :file:`./js/line_counts.php`
 * :file:`./doc/` (documentation)
 * :file:`./setup/` (setup script)
 * :file:`./examples/`
 * :file:`./sql/` (SQL scripts to configure advanced functionality)
-* :file:`./js/openlayers/` (GIS visualization)
+* :file:`./js/vendor/openlayers/` (GIS visualization)
 
 .. _faqconfig:
 

js/gis_data_editor.js

@@ -94,9 +94,9 @@ function loadJSAndGISEditor(value, field, type, input_name) {
     var script;
 
     // Loads a set of small JS file needed for the GIS editor
-    var smallScripts = [ 'js/jquery/jquery.svg.js',
-                     'js/jquery/jquery.mousewheel.js',
-                     'js/jquery/jquery.event.drag-2.2.js',
+    var smallScripts = [ 'js/vendor/jquery/jquery.svg.js',
+                     'js/vendor/jquery/jquery.mousewheel.js',
+                     'js/vendor/jquery/jquery.event.drag-2.2.js',
                      'js/tbl_gis_visualization.js' ];
 
     for (var i = 0; i < smallScripts.length; i++) {
@@ -123,7 +123,7 @@ function loadJSAndGISEditor(value, field, type, input_name) {
         loadGISEditor(value, field, type, input_name);
     }
 
-    script.src = 'js/openlayers/OpenLayers.js';
+    script.src = 'js/vendor/openlayers/OpenLayers.js';
     head.appendChild(script);
 
     gisEditorLoaded = true;

js/tbl_gis_visualization.js

@@ -3,9 +3,9 @@
  * @fileoverview    functions used for visualizing GIS data
  *
  * @requires    jquery
- * @requires    jquery/jquery.svg.js
- * @requires    jquery/jquery.mousewheel.js
- * @requires    jquery/jquery.event.drag-2.2.js
+ * @requires    vendor/jquery/jquery.svg.js
+ * @requires    vendor/jquery/jquery.mousewheel.js
+ * @requires    vendor/jquery/jquery.event.drag-2.2.js
  */
 
 // Constants
@@ -150,7 +150,7 @@ function initGISVisualization() {
     resizeGISVisualization();
     if (typeof OpenLayers !== 'undefined') {
         // Configure OpenLayers
-        OpenLayers._getScriptLocation = function() {return './js/openlayers/';};
+        OpenLayers._getScriptLocation = function() {return './js/vendor/openlayers/';};
         // Adds necessary styles to the div that coontains the openStreetMap
         styleOSM();
         // Draws openStreetMap with openLayers