Skip to content

Commit 5387a0d

Browse files
committed
Update dependencies
1 parent 7f46fc7 commit 5387a0d

File tree

9 files changed

+356
-644
lines changed

9 files changed

+356
-644
lines changed

Resources/doc/todo.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ Things to do
33

44
- Add tasks to build to execute tests, when they are appears
55
- Upgrade ``squizlabs/php_codesniffer`` to version 3 after solving https://github.com/phingofficial/phing/issues/716
6-
- Reremove optimization flags for opcache after fixing segfault with xdebug
6+
- Remove optimization flags for opcache after fixing segfault with xdebug

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
"friendsofphp/php-cs-fixer": "2.*",
6161
"pdepend/pdepend": "2.*",
6262
"phpmd/phpmd": "2.*",
63-
"phpunit/phpunit": "7.*",
63+
"phpunit/phpunit": "^8.0.2",
6464
"sebastian/phpcpd": "4.*",
6565
"squizlabs/php_codesniffer": "2.*",
6666
"symfony/debug-pack": "*",
@@ -72,7 +72,7 @@
7272
},
7373
"config": {
7474
"platform": {
75-
"php": "7.3.0"
75+
"php": "7.3.1"
7676
},
7777
"preferred-install": {
7878
"*": "dist"

composer.lock

Lines changed: 335 additions & 380 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

composer.phar

15.7 KB
Binary file not shown.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"devDependencies": {
3-
"@symfony/webpack-encore": "^0.22.0",
3+
"@symfony/webpack-encore": "^0.23.0",
44
"less": "^3.0.4",
55
"less-loader": "^4.1.0",
66
"webpack-notifier": "^1.6.0"

src/PhpOfBy/WebsiteBundle/Resources/views/default/index.html.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{% extends 'base.html.twig' %}
22

33
{% block stylesheets %}
4-
<link rel="stylesheet" href="{{ asset('css/front.css') }}"/>
4+
{{ encore_entry_link_tags('css/front') }}
55
{% endblock %}
66

77
{% block hero %}

symfony.lock

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -254,9 +254,6 @@
254254
"sabre/event": {
255255
"version": "5.0.3"
256256
},
257-
"sabre/uri": {
258-
"version": "2.1.1"
259-
},
260257
"sebastian/code-unit-reverse-lookup": {
261258
"version": "1.0.1"
262259
},

templates/base.html.twig

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@
66
<meta name="viewport" content="width=device-width, initial-scale=1">
77
<link href="/favicon.ico" rel="shortcut icon" type="image/x-icon"/>
88
<title>{% if title is defined %}{{ title }} - {% endif %}PhpOfBy</title>
9+
{# It look that we should use encore_entry_script_tags() for js, when it appears in webpack.config.js #}
910
<script src="{{ asset('runtime.js') }}"></script>
10-
<link rel="stylesheet" href="{{ asset('css/common.css') }}"/>
11+
{{ encore_entry_link_tags('css/common') }}
1112
{% block stylesheets %}{% endblock %}
1213
{{ macros.getGoogleAnalyticsCode(google_analytics_id) }}
1314
</head>

0 commit comments

Comments
 (0)