Commit Graph

94 Commits

Author SHA1 Message Date
Maurício Meneghini Fauth
9e9611d162
Replace config global with Config singleton
This is as bad as the global variable, however at least will have better
static analysis of it.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-08-15 01:11:54 -03:00
Maurício Meneghini Fauth
71493cb889
Enable Twig's strict_variables option in dev env
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-07-05 22:45:55 -03:00
Maurício Meneghini Fauth
f6e74de251
Extract some dependencies from the Application class
- Extracts the ErrorHandler, Config and Template dependencies from the
  Application class.
- Loads HTTP ServerRequest object after loading the user config.
- Requires a Config object for the Template class.
- Disables Twig's cache if an exception is thrown before loading the
  user config. This way a possible different cache directory will not be
  used.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-06-16 15:55:20 -03:00
Maurício Meneghini Fauth
946fa9dd66
Refactor Template class to lazy load the Twig Environment
Loads the Twig Environment class only when rendering a template
for the first time, not when constructing the Template object.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-05-30 17:55:30 -03:00
Maurício Meneghini Fauth
6a2c12bdc8
Add missing traversable type hints
Replace array type hint with mixed[] type hint, since it means the same.
This way it's possible to require traversable type hint for new code.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-04-02 01:32:12 -03:00
Maurício Meneghini Fauth
dd885dc7b8
Use single-line arrays when possible
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-03-27 17:39:17 -03:00
Kamil Tekiela
0e600bb1f7
Remove Tracking Twig extension (#18250)
* Remove get_tracker_version extension

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Remove test seam and fix test

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

---------

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2023-03-13 12:44:19 -03:00
Kamil Tekiela
61cfd97c4b
Use null-safe operator (#18207)
* Use null-safe operator in Template

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Use null-safe operator in Tracker

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

---------

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2023-03-03 20:37:06 -03:00
Maurício Meneghini Fauth
e38a46f7ae
Add Config as a constructor param of Template class
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-03-03 13:30:32 -03:00
Kamil Tekiela
0bdcaba2d2
Add native property types (#18143)
* Add native property types

Includes TypeHints.UnionTypeHintFormat

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Set some default values for properties

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Format and promote properties

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Remove redundant asserts

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Redundant cast

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* $tmanager->theme is never null

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Redundant variable

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Fix empty on $statementInfo bool

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Redundant casts

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Redundant issets

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* getPacked() returns nullable string

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Redundant if

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* $this->content can be null

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Simplify ThemeManager::getInstance()

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Use isset for checking if property is initialized

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Use nullable instead of uninitialized property

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* password is no longer nullable

I can't verify that none of the globals ever tried to set it to null, but the variable should never be nullable.

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Update baselines

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* $same_wide_width param can be float or int

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Update Message.php

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Cast Sub_part to int

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Fix one line doc comments

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

---------

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2023-02-26 23:30:41 -03:00
Maurício Meneghini Fauth
77957a69a5
Add trailing comma for multi-line functions
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-02-24 20:48:46 -03:00
Maurício Meneghini Fauth
4ff3724c3f
Use union with null instead of short nullable type
Since union type are now possible, using union with null makes more
clear that it is a union type.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-02-20 21:48:19 -03:00
Maurício Meneghini Fauth
b0bc4f460e
Use null safe object operator where possible
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-02-20 18:21:56 -03:00
Maurício Meneghini Fauth
35401ad4ef
Remove comparison with 'production' in Template class
Everything that is not the same as 'development' must be considered as
production mode.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-10-25 23:19:28 -03:00
Maurício Meneghini Fauth
3890d11dd8
Fix some coding style issues
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-10-16 17:18:54 -03:00
Maurício Meneghini Fauth
975e88c09f
Remove the containerBuilder global var from the Template class
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-09-29 20:06:34 -03:00
Rodrigo Pokemaobr
556804c4e2 Removing get tables from twig template and removing relationextension from twig template
Signed-off-by: Rodrigo Pokemaobr <contato@pokemaobr.dev>
2022-05-31 16:22:46 -03:00
Maurício Meneghini Fauth
5950693fb3
Fix possible undefined globals
Related to https://github.com/phpmyadmin/phpmyadmin/pull/17427.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-03-10 18:05:21 -03:00
Maurício Meneghini Fauth
1438cb211e
Replace global keyword with $GLOBALS
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-03-07 17:31:11 -03:00
Maurício Meneghini Fauth
7a4536d4d6
Remove PhpMyAdmin\Twig\PluginsExtension class
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-08-25 11:00:21 -03:00
William Desportes
3a87667cab
Merge branch 'QA_5_1'
Signed-off-by: William Desportes <williamdes@wdes.fr>
2021-07-20 17:52:16 +02:00
William Desportes
dce146f596
Fix reported "Undefined index: environment"
Reported on error reporting server

Signed-off-by: William Desportes <williamdes@wdes.fr>
2021-07-20 01:30:37 +02:00
Maurício Meneghini Fauth
1c084de30b
Fix coding standard errors
Related to 62f142c9fa.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-06-03 16:50:33 -03:00
William Desportes
48b382cb97
Merge branch 'origin/QA_5_1'
Signed-off-by: William Desportes <williamdes@wdes.fr>
2021-04-20 12:21:24 +02:00
William Desportes
a497000b98
Fix php warning on not correcly loaded configs "Trying to access array offset on value of type null"
Reported for users not having correct permissions
Signed-off-by: William Desportes <williamdes@wdes.fr>
2021-04-20 00:12:54 +02:00
Maurício Meneghini Fauth
7e23436533
Add Twig\FlashMessagesExtension class
Adds the flash() Twig function that return all flash messages.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-03-20 18:51:36 -03:00
William Desportes
1cba4b2259
Merge all Twig Environment building to one function and split out po replacements
Signed-off-by: William Desportes <williamdes@wdes.fr>
2021-03-11 16:18:03 +01:00
Maurício Meneghini Fauth
7e33d227f5
Rename the PMA_Config global variable to config
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-03-08 15:03:12 -03:00
Maurício Meneghini Fauth
d83abf63e7
Use PSR-12 for control structures spacing
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-03-05 15:27:03 -03:00
Maurício Meneghini Fauth
0b8edc5bde
Use PSR-12 for namespace use statements
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-03-05 14:18:35 -03:00
Maurício Meneghini Fauth
1e5fbd57fc
Create Twig\AssetExtension and image Twig function
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-01-28 16:09:17 -03:00
Maurício Meneghini Fauth
db3da81056 Remove some useless comments
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-10-13 19:56:56 -03:00
Maurício Meneghini Fauth
d9dc188592 Merge templates for Display\Export::getHtmlForOptions
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-07-31 20:30:21 -03:00
Maurício Meneghini Fauth
2f24a3f785 Add missing use statements in Template class
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-06-16 12:58:19 -03:00
William Desportes
bd4d353d63
Fix coding-standard issues after the merge of #16192
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-06-15 13:59:32 +02:00
William Desportes
7e5dd8eba0
Merge branch 'QA_5_0'
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-06-15 13:15:31 +02:00
William Desportes
14211e6118
Fix twig imports using old PSR-1 style
Ref: 273b666a71
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-06-14 22:55:55 +02:00
William Desportes
1b80220d7c
Update baselines and fix coding standard issues
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-06-11 20:45:59 +02:00
William Desportes
06d3c4b26c
Merge branch 'QA_5_0'
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-06-11 20:41:08 +02:00
William Desportes
a4c6a4cfb0
Fix #16184 - Use a fixed path for templates
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-06-10 22:25:02 +02:00
Maurício Meneghini Fauth
f4582e083e Use early exit when possible
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-05-27 00:35:24 -03:00
Maurício Meneghini Fauth
3baad2eb1c Fix some coding standard issues
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-05-25 22:42:37 -03:00
Maurício Meneghini Fauth
a64393e7f5 Fix some coding standard issues
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-05-13 00:23:28 -03:00
William Desportes
89220e0f0f
Change Twig_TemplateWrapper to Twig\TemplateWrapper
Ref: https://twig.symfony.com/doc/2.x/deprecated.html
Requires: twig/twig >=2.7

Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-04-28 23:49:43 +02:00
Maurício Meneghini Fauth
558226d78e Extract HTML from StorageEngine::getHtmlSelect()
Renames the method to StorageEngine::getArray().

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-03-27 19:31:35 -03:00
William Desportes
fa8bada085
Merge branch 'QA_5_0'
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-02-09 18:07:24 +01:00
William Desportes
84cd7fb4b5
Fix some php "Uncaught Error" when user is missing an extension
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-02-09 16:12:28 +01:00
Maurício Meneghini Fauth
206199105e Remove useless return type annotations
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-01-23 13:03:29 -03:00
Maurício Meneghini Fauth
676f48349a Reference global funcs and consts via use statement
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-01-21 22:13:36 -03:00
Maurício Meneghini Fauth
f80d3e3bd4 Remove unnecessary annotations
@package, @subpackage and others.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-01-20 17:35:56 -03:00