Merge pull request #35 from johanvanhelden/develop

1.4.2

.phpmyadmin/CONTRIBUTING.md

@@ -9,7 +9,7 @@ We appreciate your effort to improve phpMyAdmin by submitting a bug report. Befo
 1. Check whether the bug you face **hasn't been already reported**. Duplicate reports takes us time, that we could be used to fix other bugs or make improvements. 
 2. Specify the phpMyAdmin, server, PHP, MySQL and browser information that may be helpful to fix the problem, especially exact **version numbers**. 
 3. If you got some error, please **describe what happened** and add error message. Reports like "I get error when I clicked on some link." are useless. 
-4. Provide easy steps to reproduce and if possible include your table structure (``SHOW CREATE TABLE `tbl_name```); if your problem implies specific data, attach a small export file for sample rows. 
+4. Provide easy steps to reproduce and if possible include your table structure (``SHOW CREATE TABLE `tbl_name`;``); if your problem implies specific data, attach a small export file for sample rows. 
 5. **Security problems** should not be reported here. See [our security page](https://www.phpmyadmin.net/security/).
 Thanks for your help! 
 
@@ -20,21 +20,28 @@ Please report [bugs on GitHub][1].
 ## Patches submission
 
 Patches are welcome as [pull requests on GitHub][2].  Please include a
-Signed-off-by tag in the commit message (you can do this by passing `--signoff`
+Signed-off-by tag in the commit message (you can do this by passing [`--signoff`][4]
 parameter to Git). 
 
 When creating the commit on GitHub or using some other tool which does not have
 direct support for this, it is the same as adding 
 `Signed-off-by: Your name <email@example.com>`
 as the last line of the commit message.
 
+Example: `Signed-off-by: Jane Smith <jane.smith@example.org>`
+
 Note that by submitting patches with the Signed-off-by tag, you are giving
 permission to license the patch as GPLv2-or-later.  See [the DCO file][3] for
 details.
 
 
 [2]: https://github.com/phpmyadmin/phpmyadmin/pulls
 [3]: https://github.com/phpmyadmin/phpmyadmin/blob/master/DCO
+[4]: https://git-scm.com/docs/git-commit#Documentation/git-commit.txt---signoff
+
+## Triage issues [![Open Source Helpers](https://www.codetriage.com/phpmyadmin/phpmyadmin/badges/users.svg)](https://www.codetriage.com/phpmyadmin/phpmyadmin)
+
+You can triage issues which may include reproducing bug reports or asking for vital information, such as version numbers or reproduction instructions. If you would like to start triaging issues, one easy way to get started is to [subscribe to phpmyadmin on CodeTriage](https://www.codetriage.com/phpmyadmin/phpmyadmin).
 
 ## More information
 

.phpmyadmin/ChangeLog

@@ -35,8 +35,24 @@ phpMyAdmin - ChangeLog
 - issue #14977 Add title for group in navigation bar
 - issue #14927 Show InnoDB table overhead (free space)
 - issue #15072 Add 'Close' button to the Monitor Instructions modal
+- issue #15174 Improved filter method in server variables page
+- issue #15266 Add an external dependency injection system
 
-4.8.6 (not yet released)
+4.9.1 (not yet released)
+- issue #15313 Added support for Twig 2
+- issue #15315 Fix cannot edit or export column with default CURRENT_TIMESTAMP in MySQL >= 8.0.13
+- issue        Fix a TypeError in Import class with PHP 8
+- issue #14270 Fix Middle-click on foreign key link broken
+- issue #14363 Fix broken relational links in tables
+- issue #14987 Fix weird error for empty collation
+- issue #15334 Fix export of GIS visualisation not working (PNG, PDF, SVG)
+- issue #14918 Use hex for the phpMyAdmin session token
+- issue        Added GB18030 Chinese collations description
+- issue        Added Russian, Swedish, Slovak and Chinese UCA 9.0.0 collations description
+- issue        Added description for the _ks (kana-sensitive) collation suffix
+- issue        Added description for the _nopad (NO PAD) collation suffix
+
+4.9.0.1 (2019-06-04)
 - issue #14478 phpMyAdmin no longer streams the export data
 - issue #14514 Tables with SYSTEM VERSIONING show up as views instead of tables
 - issue #14515 Values cannot be edited in SYSTEM VERSIONING tables with INVISIBLE timestamps
@@ -134,6 +150,21 @@ phpMyAdmin - ChangeLog
 - issue #14588 Fixed export of geometry objects, GIS objects are now exported as hex
 - issue #14412 Better handling of errors with Signon authentication type
 - issue        Added support for AUTO_INCREMENT when using ROCKSDB, on Operations page
+- issue #15276 Fixed partitioning is missing in Structure page UI (MySQL 8.0)
+- issue #14252 Fixed DisableIS and database tree list (new database missing when refreshing the list)
+- issue #14621 Removed "Propose table structure" on MySQL 8.0
+- issue        Fixed editing of virtual columns on PerconaDB
+- issue #13854 Fixed column options are ignored for GENERATED/VIRTUAL/STORED columns
+- issue #15262 Fixed incorrect display of charset column (raw html)
+- issue        Added explicit parentheses in nested ternary operators
+- issue #15287 Fix auto_increment field is too small
+- issue #15283 Fix tries to change collation on views when changing collation on all tables/fields
+- issue        Fixed empty PMA_gotoWhitelist JavaScript array
+- issue #15079 Fixed responsive behaviour of instruction dialog box
+- issue #10846 Fixed javascript error when renaming a table
+- issue        Updated sql-parser to version 4.3.2
+- issue        [security] SQL injection in Designer (PMASA-2019-3)
+- issue        [security] CSRF attack on 'cookie' login form (PMASA-2019-4)
 
 4.8.5 (2019-01-25)
 - issue        Developer debug data was saved to the PHP error log

.phpmyadmin/DCO

@@ -34,7 +34,7 @@ By making a contribution to this project, I certify that:
 And please confirm your certification to the above by adding the following
 line to your patch:
 
-	Signed-off-by: Jane Developer <jane@example.org>
+    Signed-off-by: Jane Smith <jane.smith@example.org>
 
 using your real name (sorry, no pseudonyms or anonymous contributions).
 

.phpmyadmin/README

@@ -1,7 +1,7 @@
 phpMyAdmin - Readme
 ===================
 
-Version 5.0.0-dev
+Version 5.0.0-alpha1
 
 A web interface for MySQL and MariaDB.
 

.phpmyadmin/RELEASE-DATE-5.0.0-alpha1

@@ -0,0 +1 @@
+Tue Jul  9 01:57:19 UTC 2019

.phpmyadmin/ajax.php

@@ -10,7 +10,6 @@
 use PhpMyAdmin\Controllers\AjaxController;
 use PhpMyAdmin\Core;
 use PhpMyAdmin\DatabaseInterface;
-use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Response;
 use PhpMyAdmin\Util;
 
@@ -22,22 +21,15 @@
 
 require_once ROOT_PATH . 'libraries/common.inc.php';
 
-$container = Container::getDefaultContainer();
-$container->set(Response::class, Response::getInstance());
-
 /** @var Response $response */
-$response = $container->get(Response::class);
+$response = $containerBuilder->get(Response::class);
+$response->setAjax(true);
 
 /** @var DatabaseInterface $dbi */
-$dbi = $container->get(DatabaseInterface::class);
-
-$response->setAjax(true);
+$dbi = $containerBuilder->get(DatabaseInterface::class);
 
-$controller = new AjaxController(
-    $response,
-    $dbi,
-    $GLOBALS['PMA_Config']
-);
+/** @var AjaxController $controller */
+$controller = $containerBuilder->get(AjaxController::class);
 
 if (empty($_POST['type'])) {
     Core::fatalError(__('Bad type!'));

.phpmyadmin/browse_foreigners.php

@@ -10,9 +10,8 @@
 use PhpMyAdmin\BrowseForeigners;
 use PhpMyAdmin\Controllers\BrowseForeignersController;
 use PhpMyAdmin\DatabaseInterface;
-use PhpMyAdmin\Di\Container;
-use PhpMyAdmin\Relation;
 use PhpMyAdmin\Response;
+use PhpMyAdmin\Template;
 use PhpMyAdmin\Util;
 
 if (! defined('ROOT_PATH')) {
@@ -23,28 +22,30 @@
 
 Util::checkParameters(['db', 'table', 'field'], true);
 
-$container = Container::getDefaultContainer();
-$container->set(Response::class, Response::getInstance());
-
 /** @var Response $response */
-$response = $container->get(Response::class);
+$response = $containerBuilder->get(Response::class);
 
 /** @var DatabaseInterface $dbi */
-$dbi = $container->get(DatabaseInterface::class);
+$dbi = $containerBuilder->get(DatabaseInterface::class);
 
-$controller = new BrowseForeignersController(
-    $response,
-    $dbi,
+/** @var Template $template */
+$template = $containerBuilder->get('template');
+/* Register BrowseForeignersController dependencies */
+$containerBuilder->set(
+    'browse_foreigners',
     new BrowseForeigners(
         $GLOBALS['cfg']['LimitChars'],
         $GLOBALS['cfg']['MaxRows'],
         $GLOBALS['cfg']['RepeatCells'],
         $GLOBALS['cfg']['ShowAll'],
-        $GLOBALS['pmaThemeImage']
-    ),
-    new Relation($dbi)
+        $GLOBALS['pmaThemeImage'],
+        $template
+    )
 );
 
+/** @var BrowseForeignersController $controller */
+$controller = $containerBuilder->get(BrowseForeignersController::class);
+
 $response->getFooter()->setMinimal();
 $header = $response->getHeader();
 $header->disableMenuAndConsole();

.phpmyadmin/changelog.php

@@ -7,8 +7,8 @@
  */
 declare(strict_types=1);
 
-use PhpMyAdmin\Template;
 use PhpMyAdmin\Response;
+use PhpMyAdmin\Template;
 
 if (! defined('ROOT_PATH')) {
     define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
@@ -19,7 +19,8 @@
  */
 require ROOT_PATH . 'libraries/common.inc.php';
 
-$template = new Template();
+/** @var Template $template */
+$template = $containerBuilder->get('template');
 
 $response = Response::getInstance();
 $response->disable();
@@ -100,7 +101,7 @@
     => '\\1<b>\\2</b>',
 
     // Links target and rel
-    '/a href="/' => 'a target="_blank" rel="noopener noreferrer" href="'
+    '/a href="/' => 'a target="_blank" rel="noopener noreferrer" href="',
 
 ];
 

.phpmyadmin/chk_rel.php

@@ -8,7 +8,6 @@
 declare(strict_types=1);
 
 use PhpMyAdmin\DatabaseInterface;
-use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Relation;
 use PhpMyAdmin\Response;
 
@@ -18,16 +17,14 @@
 
 require_once ROOT_PATH . 'libraries/common.inc.php';
 
-$container = Container::getDefaultContainer();
-$container->set(Response::class, Response::getInstance());
-
 /** @var Response $response */
-$response = $container->get(Response::class);
+$response = $containerBuilder->get(Response::class);
 
 /** @var DatabaseInterface $dbi */
-$dbi = $container->get(DatabaseInterface::class);
+$dbi = $containerBuilder->get(DatabaseInterface::class);
 
-$relation = new Relation($dbi);
+/** @var Relation $relation */
+$relation = $containerBuilder->get('relation');
 
 // If request for creating the pmadb
 if (isset($_POST['create_pmadb']) && $relation->createPmaDatabase()) {