diff --git a/app/Resources/FOSUserBundle/views/ChangePassword/change_password_content.html.twig b/app/Resources/FOSUserBundle/views/ChangePassword/change_password_content.html.twig
index 09a8026f..fe4bcdcf 100644
--- a/app/Resources/FOSUserBundle/views/ChangePassword/change_password_content.html.twig
+++ b/app/Resources/FOSUserBundle/views/ChangePassword/change_password_content.html.twig
@@ -6,7 +6,7 @@
{{ form_errors(form.current_password) }}
{{ form_widget(form.current_password) }}
-
+
@@ -15,7 +15,7 @@
{{ form_errors(form.plainPassword.first) }}
{{ form_widget(form.plainPassword.first) }}
-
+
@@ -24,7 +24,7 @@
{{ form_errors(form.plainPassword.second) }}
{{ form_widget(form.plainPassword.second) }}
-
+
diff --git a/app/Resources/FOSUserBundle/views/Profile/edit_content.html.twig b/app/Resources/FOSUserBundle/views/Profile/edit_content.html.twig
index 0ee2f394..b66050fd 100644
--- a/app/Resources/FOSUserBundle/views/Profile/edit_content.html.twig
+++ b/app/Resources/FOSUserBundle/views/Profile/edit_content.html.twig
@@ -6,7 +6,7 @@
{{ form_errors(form.username) }}
{{ form_widget(form.username) }}
-
+
@@ -15,7 +15,7 @@
{{ form_errors(form.email) }}
{{ form_widget(form.email) }}
-
+
@@ -24,7 +24,7 @@
{{ form_errors(form.current_password) }}
{{ form_widget(form.current_password) }}
-
+
diff --git a/app/Resources/FOSUserBundle/views/Resetting/request.html.twig b/app/Resources/FOSUserBundle/views/Resetting/request.html.twig
index edee3e9a..8e099f28 100644
--- a/app/Resources/FOSUserBundle/views/Resetting/request.html.twig
+++ b/app/Resources/FOSUserBundle/views/Resetting/request.html.twig
@@ -20,7 +20,7 @@
-
+
diff --git a/app/Resources/FOSUserBundle/views/Security/login.html.twig b/app/Resources/FOSUserBundle/views/Security/login.html.twig
index 0abcccc8..865286e7 100644
--- a/app/Resources/FOSUserBundle/views/Security/login.html.twig
+++ b/app/Resources/FOSUserBundle/views/Security/login.html.twig
@@ -27,7 +27,7 @@
-
+
@@ -35,7 +35,7 @@
-
+
diff --git a/composer.json b/composer.json
index ca5fc6f9..e6b06172 100644
--- a/composer.json
+++ b/composer.json
@@ -1,8 +1,8 @@
{
"name": "okvpn/private-package",
"description": "Private Package for Vendors",
- "keywords": ["package", "composer", "private packagest"],
- "homepage": "http://packagist.org/",
+ "keywords": ["package", "composer", "private packagist"],
+ "homepage": "https://github.com/vtsykun/private-packagist/",
"type": "project",
"license": "MIT",
"authors": [
@@ -18,11 +18,12 @@
},
{
"name": "Uladzimir Tsykun",
- "email": "vtsykun@okvpn.org"
+ "email": "vtsykun@okvpn.org",
+ "homepage": "https://github.com/vtsykun"
}
],
"support": {
- "email": "vtsykun@okvpn.org"
+ "email": "vtsykun@okvpn.org"
},
"autoload": {
"psr-4": { "Packagist\\": "src/Packagist/" },
diff --git a/composer.lock b/composer.lock
index 66ac9357..5c5275d5 100644
--- a/composer.lock
+++ b/composer.lock
@@ -68,16 +68,16 @@
},
{
"name": "composer/ca-bundle",
- "version": "1.1.1",
+ "version": "1.1.2",
"source": {
"type": "git",
"url": "https://github.com/composer/ca-bundle.git",
- "reference": "d2c0a83b7533d6912e8d516756ebd34f893e9169"
+ "reference": "46afded9720f40b9dc63542af4e3e43a1177acb0"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/composer/ca-bundle/zipball/d2c0a83b7533d6912e8d516756ebd34f893e9169",
- "reference": "d2c0a83b7533d6912e8d516756ebd34f893e9169",
+ "url": "https://api.github.com/repos/composer/ca-bundle/zipball/46afded9720f40b9dc63542af4e3e43a1177acb0",
+ "reference": "46afded9720f40b9dc63542af4e3e43a1177acb0",
"shasum": ""
},
"require": {
@@ -120,30 +120,30 @@
"ssl",
"tls"
],
- "time": "2018-03-29T19:57:20+00:00"
+ "time": "2018-08-08T08:57:40+00:00"
},
{
"name": "composer/composer",
- "version": "1.6.5",
+ "version": "1.7.2",
"source": {
"type": "git",
"url": "https://github.com/composer/composer.git",
- "reference": "b184a92419cc9a9c4c6a09db555a94d441cb11c9"
+ "reference": "576aab9b5abb2ed11a1c52353a759363216a4ad2"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/composer/composer/zipball/b184a92419cc9a9c4c6a09db555a94d441cb11c9",
- "reference": "b184a92419cc9a9c4c6a09db555a94d441cb11c9",
+ "url": "https://api.github.com/repos/composer/composer/zipball/576aab9b5abb2ed11a1c52353a759363216a4ad2",
+ "reference": "576aab9b5abb2ed11a1c52353a759363216a4ad2",
"shasum": ""
},
"require": {
"composer/ca-bundle": "^1.0",
"composer/semver": "^1.0",
"composer/spdx-licenses": "^1.2",
+ "composer/xdebug-handler": "^1.1",
"justinrainbow/json-schema": "^3.0 || ^4.0 || ^5.0",
"php": "^5.3.2 || ^7.0",
"psr/log": "^1.0",
- "seld/cli-prompt": "^1.0",
"seld/jsonlint": "^1.4",
"seld/phar-utils": "^1.0",
"symfony/console": "^2.7 || ^3.0 || ^4.0",
@@ -169,7 +169,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.6-dev"
+ "dev-master": "1.7-dev"
}
},
"autoload": {
@@ -200,7 +200,7 @@
"dependency",
"package"
],
- "time": "2018-05-04T09:44:59+00:00"
+ "time": "2018-08-16T14:57:12+00:00"
},
{
"name": "composer/semver",
@@ -325,6 +325,50 @@
],
"time": "2018-04-30T10:33:04+00:00"
},
+ {
+ "name": "composer/xdebug-handler",
+ "version": "1.2.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/composer/xdebug-handler.git",
+ "reference": "e37cbd80da64afe314c72de8d2d2fec0e40d9373"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/e37cbd80da64afe314c72de8d2d2fec0e40d9373",
+ "reference": "e37cbd80da64afe314c72de8d2d2fec0e40d9373",
+ "shasum": ""
+ },
+ "require": {
+ "php": "^5.3.2 || ^7.0",
+ "psr/log": "^1.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "Composer\\XdebugHandler\\": "src"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "John Stevenson",
+ "email": "john-stevenson@blueyonder.co.uk"
+ }
+ ],
+ "description": "Restarts a process without xdebug.",
+ "keywords": [
+ "Xdebug",
+ "performance"
+ ],
+ "time": "2018-08-23T12:00:19+00:00"
+ },
{
"name": "container-interop/container-interop",
"version": "1.2.0",
@@ -426,16 +470,16 @@
},
{
"name": "doctrine/cache",
- "version": "v1.7.1",
+ "version": "v1.8.0",
"source": {
"type": "git",
"url": "https://github.com/doctrine/cache.git",
- "reference": "b3217d58609e9c8e661cd41357a54d926c4a2a1a"
+ "reference": "d768d58baee9a4862ca783840eca1b9add7a7f57"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/cache/zipball/b3217d58609e9c8e661cd41357a54d926c4a2a1a",
- "reference": "b3217d58609e9c8e661cd41357a54d926c4a2a1a",
+ "url": "https://api.github.com/repos/doctrine/cache/zipball/d768d58baee9a4862ca783840eca1b9add7a7f57",
+ "reference": "d768d58baee9a4862ca783840eca1b9add7a7f57",
"shasum": ""
},
"require": {
@@ -446,8 +490,9 @@
},
"require-dev": {
"alcaeus/mongo-php-adapter": "^1.1",
+ "doctrine/coding-standard": "^4.0",
"mongodb/mongodb": "^1.1",
- "phpunit/phpunit": "^5.7",
+ "phpunit/phpunit": "^7.0",
"predis/predis": "~1.0"
},
"suggest": {
@@ -456,7 +501,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.7.x-dev"
+ "dev-master": "1.8.x-dev"
}
},
"autoload": {
@@ -491,12 +536,12 @@
}
],
"description": "Caching library offering an object-oriented API for many cache backends",
- "homepage": "http://www.doctrine-project.org",
+ "homepage": "https://www.doctrine-project.org",
"keywords": [
"cache",
"caching"
],
- "time": "2017-08-25T07:02:50+00:00"
+ "time": "2018-08-21T18:01:43+00:00"
},
{
"name": "doctrine/collections",
@@ -1233,16 +1278,16 @@
},
{
"name": "doctrine/persistence",
- "version": "v1.0.0",
+ "version": "v1.0.1",
"source": {
"type": "git",
"url": "https://github.com/doctrine/persistence.git",
- "reference": "17896f6d56a2794a1619e019596ae627aabd8fd5"
+ "reference": "af1ec238659a83e320f03e0e454e200f689b4b97"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/persistence/zipball/17896f6d56a2794a1619e019596ae627aabd8fd5",
- "reference": "17896f6d56a2794a1619e019596ae627aabd8fd5",
+ "url": "https://api.github.com/repos/doctrine/persistence/zipball/af1ec238659a83e320f03e0e454e200f689b4b97",
+ "reference": "af1ec238659a83e320f03e0e454e200f689b4b97",
"shasum": ""
},
"require": {
@@ -1307,7 +1352,7 @@
"keywords": [
"persistence"
],
- "time": "2018-06-14T18:57:48+00:00"
+ "time": "2018-07-12T12:37:50+00:00"
},
{
"name": "doctrine/reflection",
@@ -2213,21 +2258,21 @@
},
{
"name": "oro/doctrine-extensions",
- "version": "1.2.0",
+ "version": "1.2.1",
"source": {
"type": "git",
- "url": "https://github.com/orocrm/doctrine-extensions.git",
- "reference": "26f38a2065d36d308331ccecb0b5ef31d61541d2"
+ "url": "https://github.com/oroinc/doctrine-extensions.git",
+ "reference": "cfe8d4daa82f46e846480d24c51a6a5182e8cb95"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/orocrm/doctrine-extensions/zipball/26f38a2065d36d308331ccecb0b5ef31d61541d2",
- "reference": "26f38a2065d36d308331ccecb0b5ef31d61541d2",
+ "url": "https://api.github.com/repos/oroinc/doctrine-extensions/zipball/cfe8d4daa82f46e846480d24c51a6a5182e8cb95",
+ "reference": "cfe8d4daa82f46e846480d24c51a6a5182e8cb95",
"shasum": ""
},
"require": {
"doctrine/orm": ">=2.2.3",
- "php": ">=5.3.0"
+ "php": ">=5.4.0"
},
"require-dev": {
"doctrine/data-fixtures": "^1.0",
@@ -2264,7 +2309,7 @@
"postgresql",
"type"
],
- "time": "2017-07-17T10:33:16+00:00"
+ "time": "2018-08-15T09:13:39+00:00"
},
{
"name": "pagerfanta/pagerfanta",
@@ -2723,54 +2768,6 @@
],
"time": "2017-10-23T01:57:42+00:00"
},
- {
- "name": "seld/cli-prompt",
- "version": "1.0.3",
- "source": {
- "type": "git",
- "url": "https://github.com/Seldaek/cli-prompt.git",
- "reference": "a19a7376a4689d4d94cab66ab4f3c816019ba8dd"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/Seldaek/cli-prompt/zipball/a19a7376a4689d4d94cab66ab4f3c816019ba8dd",
- "reference": "a19a7376a4689d4d94cab66ab4f3c816019ba8dd",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.x-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "Seld\\CliPrompt\\": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Jordi Boggiano",
- "email": "j.boggiano@seld.be"
- }
- ],
- "description": "Allows you to prompt for user input on the command line, and optionally hide the characters they type",
- "keywords": [
- "cli",
- "console",
- "hidden",
- "input",
- "prompt"
- ],
- "time": "2017-03-18T11:32:45+00:00"
- },
{
"name": "seld/jsonlint",
"version": "1.7.1",
@@ -3135,16 +3132,16 @@
},
{
"name": "snc/redis-bundle",
- "version": "2.1.4",
+ "version": "2.1.6",
"source": {
"type": "git",
"url": "https://github.com/snc/SncRedisBundle.git",
- "reference": "3f3c233ebbfba43d3abd2403be0bc34c11e6dc06"
+ "reference": "fd24b115b35d54ec2f0f356e36e793933ee57bb8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/snc/SncRedisBundle/zipball/3f3c233ebbfba43d3abd2403be0bc34c11e6dc06",
- "reference": "3f3c233ebbfba43d3abd2403be0bc34c11e6dc06",
+ "url": "https://api.github.com/repos/snc/SncRedisBundle/zipball/fd24b115b35d54ec2f0f356e36e793933ee57bb8",
+ "reference": "fd24b115b35d54ec2f0f356e36e793933ee57bb8",
"shasum": ""
},
"require": {
@@ -3162,7 +3159,8 @@
"suggest": {
"monolog/monolog": "If you want to use the monolog redis handler.",
"predis/predis": "If you want to use predis.",
- "symfony/console": "If you want to use commands to interact with the redis database"
+ "symfony/console": "If you want to use commands to interact with the redis database",
+ "symfony/proxy-manager-bridge": "If you want to lazy-load some services"
},
"type": "symfony-bundle",
"extra": {
@@ -3196,20 +3194,20 @@
"redis",
"symfony"
],
- "time": "2018-06-25T15:31:46+00:00"
+ "time": "2018-07-31T08:05:28+00:00"
},
{
"name": "swiftmailer/swiftmailer",
- "version": "v5.4.9",
+ "version": "v5.4.12",
"source": {
"type": "git",
"url": "https://github.com/swiftmailer/swiftmailer.git",
- "reference": "7ffc1ea296ed14bf8260b6ef11b80208dbadba91"
+ "reference": "181b89f18a90f8925ef805f950d47a7190e9b950"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/7ffc1ea296ed14bf8260b6ef11b80208dbadba91",
- "reference": "7ffc1ea296ed14bf8260b6ef11b80208dbadba91",
+ "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/181b89f18a90f8925ef805f950d47a7190e9b950",
+ "reference": "181b89f18a90f8925ef805f950d47a7190e9b950",
"shasum": ""
},
"require": {
@@ -3250,7 +3248,7 @@
"mail",
"mailer"
],
- "time": "2018-01-23T07:37:21+00:00"
+ "time": "2018-07-31T09:26:32+00:00"
},
{
"name": "symfony/monolog-bundle",
@@ -3314,16 +3312,16 @@
},
{
"name": "symfony/polyfill-apcu",
- "version": "v1.8.0",
+ "version": "v1.9.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-apcu.git",
- "reference": "9b83bd010112ec196410849e840d9b9fefcb15ad"
+ "reference": "19e1b73bf255265ad0b568f81766ae2a3266d8d2"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-apcu/zipball/9b83bd010112ec196410849e840d9b9fefcb15ad",
- "reference": "9b83bd010112ec196410849e840d9b9fefcb15ad",
+ "url": "https://api.github.com/repos/symfony/polyfill-apcu/zipball/19e1b73bf255265ad0b568f81766ae2a3266d8d2",
+ "reference": "19e1b73bf255265ad0b568f81766ae2a3266d8d2",
"shasum": ""
},
"require": {
@@ -3332,7 +3330,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.8-dev"
+ "dev-master": "1.9-dev"
}
},
"autoload": {
@@ -3366,29 +3364,32 @@
"portable",
"shim"
],
- "time": "2018-04-26T10:06:28+00:00"
+ "time": "2018-08-06T14:22:27+00:00"
},
{
"name": "symfony/polyfill-ctype",
- "version": "v1.8.0",
+ "version": "v1.9.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-ctype.git",
- "reference": "7cc359f1b7b80fc25ed7796be7d96adc9b354bae"
+ "reference": "e3d826245268269cd66f8326bd8bc066687b4a19"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/7cc359f1b7b80fc25ed7796be7d96adc9b354bae",
- "reference": "7cc359f1b7b80fc25ed7796be7d96adc9b354bae",
+ "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/e3d826245268269cd66f8326bd8bc066687b4a19",
+ "reference": "e3d826245268269cd66f8326bd8bc066687b4a19",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
+ "suggest": {
+ "ext-ctype": "For best performance"
+ },
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.8-dev"
+ "dev-master": "1.9-dev"
}
},
"autoload": {
@@ -3421,20 +3422,20 @@
"polyfill",
"portable"
],
- "time": "2018-04-30T19:57:29+00:00"
+ "time": "2018-08-06T14:22:27+00:00"
},
{
"name": "symfony/polyfill-intl-icu",
- "version": "v1.8.0",
+ "version": "v1.9.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-intl-icu.git",
- "reference": "80ee17ae83c10cd513e5144f91a73607a21edb4e"
+ "reference": "f22a90256d577c7ef7efad8df1f0201663d57644"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-intl-icu/zipball/80ee17ae83c10cd513e5144f91a73607a21edb4e",
- "reference": "80ee17ae83c10cd513e5144f91a73607a21edb4e",
+ "url": "https://api.github.com/repos/symfony/polyfill-intl-icu/zipball/f22a90256d577c7ef7efad8df1f0201663d57644",
+ "reference": "f22a90256d577c7ef7efad8df1f0201663d57644",
"shasum": ""
},
"require": {
@@ -3447,7 +3448,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.8-dev"
+ "dev-master": "1.9-dev"
}
},
"autoload": {
@@ -3479,20 +3480,20 @@
"portable",
"shim"
],
- "time": "2018-04-25T14:53:50+00:00"
+ "time": "2018-08-06T14:22:27+00:00"
},
{
"name": "symfony/polyfill-mbstring",
- "version": "v1.8.0",
+ "version": "v1.9.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git",
- "reference": "3296adf6a6454a050679cde90f95350ad604b171"
+ "reference": "d0cd638f4634c16d8df4508e847f14e9e43168b8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/3296adf6a6454a050679cde90f95350ad604b171",
- "reference": "3296adf6a6454a050679cde90f95350ad604b171",
+ "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/d0cd638f4634c16d8df4508e847f14e9e43168b8",
+ "reference": "d0cd638f4634c16d8df4508e847f14e9e43168b8",
"shasum": ""
},
"require": {
@@ -3504,7 +3505,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.8-dev"
+ "dev-master": "1.9-dev"
}
},
"autoload": {
@@ -3538,20 +3539,20 @@
"portable",
"shim"
],
- "time": "2018-04-26T10:06:28+00:00"
+ "time": "2018-08-06T14:22:27+00:00"
},
{
"name": "symfony/polyfill-php56",
- "version": "v1.8.0",
+ "version": "v1.9.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php56.git",
- "reference": "af98553c84912459db3f636329567809d639a8f6"
+ "reference": "7b4fc009172cc0196535b0328bd1226284a28000"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/af98553c84912459db3f636329567809d639a8f6",
- "reference": "af98553c84912459db3f636329567809d639a8f6",
+ "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/7b4fc009172cc0196535b0328bd1226284a28000",
+ "reference": "7b4fc009172cc0196535b0328bd1226284a28000",
"shasum": ""
},
"require": {
@@ -3561,7 +3562,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.8-dev"
+ "dev-master": "1.9-dev"
}
},
"autoload": {
@@ -3594,30 +3595,30 @@
"portable",
"shim"
],
- "time": "2018-04-26T10:06:28+00:00"
+ "time": "2018-08-06T14:22:27+00:00"
},
{
"name": "symfony/polyfill-php70",
- "version": "v1.8.0",
+ "version": "v1.9.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php70.git",
- "reference": "77454693d8f10dd23bb24955cffd2d82db1007a6"
+ "reference": "1e24b0c4a56d55aaf368763a06c6d1c7d3194934"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/77454693d8f10dd23bb24955cffd2d82db1007a6",
- "reference": "77454693d8f10dd23bb24955cffd2d82db1007a6",
+ "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/1e24b0c4a56d55aaf368763a06c6d1c7d3194934",
+ "reference": "1e24b0c4a56d55aaf368763a06c6d1c7d3194934",
"shasum": ""
},
"require": {
- "paragonie/random_compat": "~1.0|~2.0",
+ "paragonie/random_compat": "~1.0|~2.0|~9.99",
"php": ">=5.3.3"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.8-dev"
+ "dev-master": "1.9-dev"
}
},
"autoload": {
@@ -3653,20 +3654,20 @@
"portable",
"shim"
],
- "time": "2018-04-26T10:06:28+00:00"
+ "time": "2018-08-06T14:22:27+00:00"
},
{
"name": "symfony/polyfill-util",
- "version": "v1.8.0",
+ "version": "v1.9.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-util.git",
- "reference": "1a5ad95d9436cbff3296034fe9f8d586dce3fb3a"
+ "reference": "8e15d04ba3440984d23e7964b2ee1d25c8de1581"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/1a5ad95d9436cbff3296034fe9f8d586dce3fb3a",
- "reference": "1a5ad95d9436cbff3296034fe9f8d586dce3fb3a",
+ "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/8e15d04ba3440984d23e7964b2ee1d25c8de1581",
+ "reference": "8e15d04ba3440984d23e7964b2ee1d25c8de1581",
"shasum": ""
},
"require": {
@@ -3675,7 +3676,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.8-dev"
+ "dev-master": "1.9-dev"
}
},
"autoload": {
@@ -3705,7 +3706,7 @@
"polyfill",
"shim"
],
- "time": "2018-04-26T10:06:28+00:00"
+ "time": "2018-08-06T14:22:27+00:00"
},
{
"name": "symfony/security-acl",
@@ -3829,20 +3830,20 @@
},
{
"name": "symfony/symfony",
- "version": "v3.4.12",
+ "version": "v3.4.15",
"source": {
"type": "git",
"url": "https://github.com/symfony/symfony.git",
- "reference": "c36f8cb21b5f1661a14fdb8cef9cc611d54a3494"
+ "reference": "5bb5c2d4b0d5cf10672015b68519a199e6ac27c1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/symfony/zipball/c36f8cb21b5f1661a14fdb8cef9cc611d54a3494",
- "reference": "c36f8cb21b5f1661a14fdb8cef9cc611d54a3494",
+ "url": "https://api.github.com/repos/symfony/symfony/zipball/5bb5c2d4b0d5cf10672015b68519a199e6ac27c1",
+ "reference": "5bb5c2d4b0d5cf10672015b68519a199e6ac27c1",
"shasum": ""
},
"require": {
- "doctrine/common": "~2.4@stable",
+ "doctrine/common": "~2.4",
"ext-xml": "*",
"fig/link-util": "^1.0",
"php": "^5.5.9|>=7.0.8",
@@ -3861,7 +3862,7 @@
},
"conflict": {
"phpdocumentor/reflection-docblock": "<3.0||>=3.2.0,<3.2.2",
- "phpdocumentor/type-resolver": "<0.2.1",
+ "phpdocumentor/type-resolver": "<0.3.0",
"phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0"
},
"provide": {
@@ -3980,28 +3981,28 @@
"keywords": [
"framework"
],
- "time": "2018-06-25T12:29:33+00:00"
+ "time": "2018-08-28T06:06:28+00:00"
},
{
"name": "twig/extensions",
- "version": "v1.5.1",
+ "version": "v1.5.2",
"source": {
"type": "git",
"url": "https://github.com/twigphp/Twig-extensions.git",
- "reference": "d188c76168b853481cc75879ea045bf93d718e9c"
+ "reference": "2c1a86526d0044065220d1b51ac08348bea5ca82"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/twigphp/Twig-extensions/zipball/d188c76168b853481cc75879ea045bf93d718e9c",
- "reference": "d188c76168b853481cc75879ea045bf93d718e9c",
+ "url": "https://api.github.com/repos/twigphp/Twig-extensions/zipball/2c1a86526d0044065220d1b51ac08348bea5ca82",
+ "reference": "2c1a86526d0044065220d1b51ac08348bea5ca82",
"shasum": ""
},
"require": {
- "twig/twig": "~1.27|~2.0"
+ "twig/twig": "^1.27|^2.0"
},
"require-dev": {
- "symfony/phpunit-bridge": "~3.3@dev",
- "symfony/translation": "~2.3|~3.0"
+ "symfony/phpunit-bridge": "^3.4",
+ "symfony/translation": "^2.7|^3.4"
},
"suggest": {
"symfony/translation": "Allow the time_diff output to be translated"
@@ -4031,12 +4032,11 @@
}
],
"description": "Common additional features for Twig that do not directly belong in core",
- "homepage": "http://twig.sensiolabs.org/doc/extensions/index.html",
"keywords": [
"i18n",
"text"
],
- "time": "2017-06-08T18:19:53+00:00"
+ "time": "2018-05-22T13:26:07+00:00"
},
{
"name": "twig/twig",
@@ -4211,16 +4211,16 @@
},
{
"name": "zendframework/zend-feed",
- "version": "2.10.2",
+ "version": "2.10.3",
"source": {
"type": "git",
"url": "https://github.com/zendframework/zend-feed.git",
- "reference": "5253f949f4ad999086ab9b408908b6c6776f24db"
+ "reference": "6641f4cf3f4586c63f83fd70b6d19966025c8888"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-feed/zipball/5253f949f4ad999086ab9b408908b6c6776f24db",
- "reference": "5253f949f4ad999086ab9b408908b6c6776f24db",
+ "url": "https://api.github.com/repos/zendframework/zend-feed/zipball/6641f4cf3f4586c63f83fd70b6d19966025c8888",
+ "reference": "6641f4cf3f4586c63f83fd70b6d19966025c8888",
"shasum": ""
},
"require": {
@@ -4268,7 +4268,7 @@
"feed",
"zf"
],
- "time": "2018-06-18T20:14:01+00:00"
+ "time": "2018-08-01T13:53:20+00:00"
},
{
"name": "zendframework/zend-servicemanager",
@@ -4324,16 +4324,16 @@
},
{
"name": "zendframework/zend-stdlib",
- "version": "3.2.0",
+ "version": "3.2.1",
"source": {
"type": "git",
"url": "https://github.com/zendframework/zend-stdlib.git",
- "reference": "cd164b4a18b5d1aeb69be2c26db035b5ed6925ae"
+ "reference": "66536006722aff9e62d1b331025089b7ec71c065"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-stdlib/zipball/cd164b4a18b5d1aeb69be2c26db035b5ed6925ae",
- "reference": "cd164b4a18b5d1aeb69be2c26db035b5ed6925ae",
+ "url": "https://api.github.com/repos/zendframework/zend-stdlib/zipball/66536006722aff9e62d1b331025089b7ec71c065",
+ "reference": "66536006722aff9e62d1b331025089b7ec71c065",
"shasum": ""
},
"require": {
@@ -4366,7 +4366,7 @@
"stdlib",
"zf"
],
- "time": "2018-04-30T13:50:40+00:00"
+ "time": "2018-08-28T21:34:05+00:00"
},
{
"name": "zendframework/zend-uri",
@@ -4792,16 +4792,16 @@
},
{
"name": "phpspec/prophecy",
- "version": "1.7.6",
+ "version": "1.8.0",
"source": {
"type": "git",
"url": "https://github.com/phpspec/prophecy.git",
- "reference": "33a7e3c4fda54e912ff6338c48823bd5c0f0b712"
+ "reference": "4ba436b55987b4bf311cb7c6ba82aa528aac0a06"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpspec/prophecy/zipball/33a7e3c4fda54e912ff6338c48823bd5c0f0b712",
- "reference": "33a7e3c4fda54e912ff6338c48823bd5c0f0b712",
+ "url": "https://api.github.com/repos/phpspec/prophecy/zipball/4ba436b55987b4bf311cb7c6ba82aa528aac0a06",
+ "reference": "4ba436b55987b4bf311cb7c6ba82aa528aac0a06",
"shasum": ""
},
"require": {
@@ -4813,12 +4813,12 @@
},
"require-dev": {
"phpspec/phpspec": "^2.5|^3.2",
- "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5"
+ "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5 || ^7.1"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.7.x-dev"
+ "dev-master": "1.8.x-dev"
}
},
"autoload": {
@@ -4851,7 +4851,7 @@
"spy",
"stub"
],
- "time": "2018-04-18T13:57:24+00:00"
+ "time": "2018-08-05T17:53:17+00:00"
},
{
"name": "phpunit/php-code-coverage",
@@ -5104,16 +5104,16 @@
},
{
"name": "phpunit/phpunit",
- "version": "6.5.9",
+ "version": "6.5.12",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
- "reference": "093ca5508174cd8ab8efe44fd1dde447adfdec8f"
+ "reference": "24da433d7384824d65ea93fbb462e2f31bbb494e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/093ca5508174cd8ab8efe44fd1dde447adfdec8f",
- "reference": "093ca5508174cd8ab8efe44fd1dde447adfdec8f",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/24da433d7384824d65ea93fbb462e2f31bbb494e",
+ "reference": "24da433d7384824d65ea93fbb462e2f31bbb494e",
"shasum": ""
},
"require": {
@@ -5131,7 +5131,7 @@
"phpunit/php-file-iterator": "^1.4.3",
"phpunit/php-text-template": "^1.2.1",
"phpunit/php-timer": "^1.0.9",
- "phpunit/phpunit-mock-objects": "^5.0.5",
+ "phpunit/phpunit-mock-objects": "^5.0.9",
"sebastian/comparator": "^2.1",
"sebastian/diff": "^2.0",
"sebastian/environment": "^3.1",
@@ -5184,20 +5184,20 @@
"testing",
"xunit"
],
- "time": "2018-07-03T06:40:40+00:00"
+ "time": "2018-08-22T06:32:48+00:00"
},
{
"name": "phpunit/phpunit-mock-objects",
- "version": "5.0.8",
+ "version": "5.0.10",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
- "reference": "6f9a3c8bf34188a2b53ce2ae7a126089c53e0a9f"
+ "reference": "cd1cf05c553ecfec36b170070573e540b67d3f1f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/6f9a3c8bf34188a2b53ce2ae7a126089c53e0a9f",
- "reference": "6f9a3c8bf34188a2b53ce2ae7a126089c53e0a9f",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/cd1cf05c553ecfec36b170070573e540b67d3f1f",
+ "reference": "cd1cf05c553ecfec36b170070573e540b67d3f1f",
"shasum": ""
},
"require": {
@@ -5210,7 +5210,7 @@
"phpunit/phpunit": "<6.0"
},
"require-dev": {
- "phpunit/phpunit": "^6.5"
+ "phpunit/phpunit": "^6.5.11"
},
"suggest": {
"ext-soap": "*"
@@ -5243,7 +5243,7 @@
"mock",
"xunit"
],
- "time": "2018-07-13T03:27:23+00:00"
+ "time": "2018-08-09T05:50:03+00:00"
},
{
"name": "sebastian/code-unit-reverse-lookup",
@@ -5806,16 +5806,16 @@
},
{
"name": "symfony/phpunit-bridge",
- "version": "v3.4.12",
+ "version": "v3.4.15",
"source": {
"type": "git",
"url": "https://github.com/symfony/phpunit-bridge.git",
- "reference": "8a21eb6bedad38bf1f15d529c65eb9e17d0242fd"
+ "reference": "f4fde1ede82c7ca2a4f06cf48521a185b26c0fed"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/8a21eb6bedad38bf1f15d529c65eb9e17d0242fd",
- "reference": "8a21eb6bedad38bf1f15d529c65eb9e17d0242fd",
+ "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/f4fde1ede82c7ca2a4f06cf48521a185b26c0fed",
+ "reference": "f4fde1ede82c7ca2a4f06cf48521a185b26c0fed",
"shasum": ""
},
"require": {
@@ -5868,7 +5868,7 @@
],
"description": "Symfony PHPUnit Bridge",
"homepage": "https://symfony.com",
- "time": "2018-06-10T07:25:02+00:00"
+ "time": "2018-08-27T15:17:06+00:00"
},
{
"name": "theseer/tokenizer",
diff --git a/src/Packagist/WebBundle/Entity/Package.php b/src/Packagist/WebBundle/Entity/Package.php
index d4ea4a5f..328fd104 100644
--- a/src/Packagist/WebBundle/Entity/Package.php
+++ b/src/Packagist/WebBundle/Entity/Package.php
@@ -623,6 +623,19 @@ public function getRepository()
return $this->repository;
}
+ /**
+ * Get a user-browsable version of the repository URL
+ *
+ * @return string $repository
+ */
+ public function getBrowsableRepository()
+ {
+ if (preg_match('{(://|@)bitbucket.org[:/]}i', $this->repository)) {
+ return preg_replace('{^(?:git@|https://|git://)bitbucket.org[:/](.+?)(?:\.git)?$}i', 'https://bitbucket.org/$1', $this->repository);
+ }
+ return preg_replace('{^(git://github.com/|git@github.com:)}', 'https://github.com/', $this->repository);
+ }
+
public function loadCredentials()
{
if ($this->credentials) {
diff --git a/src/Packagist/WebBundle/Resources/public/css/main.css b/src/Packagist/WebBundle/Resources/public/css/main.css
index 7868ff6a..2c15db70 100644
--- a/src/Packagist/WebBundle/Resources/public/css/main.css
+++ b/src/Packagist/WebBundle/Resources/public/css/main.css
@@ -2,7 +2,7 @@
/*
main header: #2d2d32
- secondary header: #f28d1a
+ secondary header: #0c71d0
light grey: #f3f4f5;
colors danger/error: #ff4533 #cd3729
@@ -37,7 +37,7 @@ pre, code {
font-size: 12px;
}
pre {
- border-left: 2px solid #f28d1a;
+ border-left: 2px solid #0c71d0;
}
code.hljs { display: inline; }
@@ -53,22 +53,22 @@ body {
}
.logo {
position: absolute;
- width: 100px;
+ width: 75px;
left: -98px;
top: -33px;
}
@media (min-width: 1200px) {
.logo {
- width: 80px;
- left: -90px;
+ width: 58px;
+ left: -80px;
}
}
hr {
- border-color: #F28D1A;
+ border-color: #0c71d0;
}
a, .package .package-aside a {
- color: #B34E22;
+ color: #2f9de2;
}
a:hover, .package .package-aside a:hover {
color: #2d2d32;
@@ -162,7 +162,7 @@ strong {
}
.navbar .nav > li > a:focus {
- background: #f28d1a;
+ background: #0c71d0;
color: #fff;
}
@@ -225,7 +225,7 @@ strong {
}
.navbar .nav > .nav-user > section:hover > .nav-user-menu a:hover {
- color: #f28d1a;
+ color: #0c71d0;
}
.nav-user section img {
@@ -309,7 +309,7 @@ strong {
}
.nav-user .signin-box .signin-box-register {
- background: #f28d1a;
+ background: #0c71d0;
float: left;
font-size: 14px;
font-weight: 600;
@@ -404,7 +404,7 @@ strong {
}
.wrapper-search {
- background: #f28d1a;
+ background: #0c71d0;
}
.wrapper-search .container {
@@ -444,7 +444,7 @@ strong {
font-weight: bold;
}
.search-facets .ais-header {
- border-bottom: 1px solid #f28d1a;
+ border-bottom: 1px solid #0c71d0;
padding-bottom: 5px;
margin-bottom: 10px;
font-weight: bold;
@@ -467,7 +467,7 @@ strong {
}
.sbx-sffv__wrapper input {
height: 22px;
- border: 1px solid #f28d1a;
+ border: 1px solid #0c71d0;
border-radius: 3px;
margin-right: 6px;
padding-left: 4px;
@@ -733,7 +733,7 @@ input:focus:invalid:focus, textarea:focus:invalid:focus, select:focus:invalid:fo
}
.nav-tabs li.active a, .nav-tabs.nav-stacked > li > a:hover {
- background: #f28d1a;
+ background: #0c71d0;
color: #fff;
}
@@ -742,7 +742,7 @@ input:focus:invalid:focus, textarea:focus:invalid:focus, select:focus:invalid:fo
}
.nav-tabs.nav-stacked > li > a:hover {
- background: #f28d1a;
+ background: #0c71d0;
}
.nav-tabs.nav-stacked .fas, .nav-tabs.nav-stacked .fas {
@@ -1078,7 +1078,7 @@ input:focus:invalid:focus, textarea:focus:invalid:focus, select:focus:invalid:fo
}
.package .package-aside {
- border-top: 1px solid #f28d1a;
+ border-top: 1px solid #0c71d0;
border-radius: 0;
margin: 0;
@@ -1099,7 +1099,7 @@ input:focus:invalid:focus, textarea:focus:invalid:focus, select:focus:invalid:fo
}
.package .details-toggler.open, .package .details-toggler.open a, .package .details-toggler.open i {
- background: #f28d1a;
+ background: #0c71d0;
color: #fff;
}
@@ -1107,7 +1107,7 @@ input:focus:invalid:focus, textarea:focus:invalid:focus, select:focus:invalid:fo
margin-top: 20px;
}
.package .version-details .title {
- border-top: 1px solid #f28d1a;
+ border-top: 1px solid #0c71d0;
padding-top: 10px;
}
.package .versions {
@@ -1257,8 +1257,8 @@ input:focus:invalid:focus, textarea:focus:invalid:focus, select:focus:invalid:fo
content: "";
}
.package .version-details .package-links {
- border-top: 1px solid #f28d1a;
- border-bottom: 1px solid #f28d1a;
+ border-top: 1px solid #0c71d0;
+ border-bottom: 1px solid #0c71d0;
margin-top: 10px;
padding-top: 10px;
padding-bottom: 10px;
@@ -1296,7 +1296,7 @@ input:focus:invalid:focus, textarea:focus:invalid:focus, select:focus:invalid:fo
top: 15px;
}
.package .mark-favorite.is-starred {
- color: #F28D1A;
+ color: #0c71d0;
}
@media (max-width: 767px) {
.package .mark-favorite {
@@ -1365,7 +1365,7 @@ input:focus:invalid:focus, textarea:focus:invalid:focus, select:focus:invalid:fo
font-size: 1.5em;
}
.legend-first {
- color: #f28d1a;
+ color: #0c71d0;
}
.legend-second {
color: #2d2d32;
@@ -1374,7 +1374,7 @@ input:focus:invalid:focus, textarea:focus:invalid:focus, select:focus:invalid:fo
.wrapper .content h2.title, .wrapper .content h3.title {
margin: -5px 0 15px;
padding: 0 0 15px;
- border-bottom: 1px solid #f28d1a;
+ border-bottom: 1px solid #0c71d0;
color: #2d2d32;
}
@@ -1491,7 +1491,7 @@ input:focus:invalid:focus, textarea:focus:invalid:focus, select:focus:invalid:fo
.packages .selected .package-item {
padding: 4px 14px;
- border: 1px solid #F28D1A;
+ border: 1px solid #0c71d0;
}
.packages .package-item h4 {
@@ -1520,7 +1520,7 @@ input:focus:invalid:focus, textarea:focus:invalid:focus, select:focus:invalid:fo
margin-bottom: 0;
}
.alert-warning {
- border-left-color: #F28D1A;
+ border-left-color: #0c71d0;
color: #2d2d32;
}
.alert-danger, .alert-error {
@@ -1665,13 +1665,13 @@ svg.chart {
}
.package-panel-info {
- border-color: #f28d1a;
+ border-color: #0c71d0;
}
.package-panel-danger {
border-color: #cd3729;
}
.package-panel-info >.panel-heading {
- background-image: linear-gradient(#f28d1a, #f59d3e);
+ background-image: linear-gradient(#0c71d0, #405cd0);
}
.package-panel-danger >.panel-heading {
background-image: linear-gradient(#cd3729, #cd554c);
diff --git a/src/Packagist/WebBundle/Resources/public/js/charts.js b/src/Packagist/WebBundle/Resources/public/js/charts.js
index 9d2234cd..295b5ec9 100644
--- a/src/Packagist/WebBundle/Resources/public/js/charts.js
+++ b/src/Packagist/WebBundle/Resources/public/js/charts.js
@@ -2,7 +2,7 @@
"use strict";
var colors = [
- '#f28d1a',
+ '#0c71d0',
'#2d2d32'
];
diff --git a/src/Packagist/WebBundle/Resources/views/Group/index.html.twig b/src/Packagist/WebBundle/Resources/views/Group/index.html.twig
index 053f716f..9fddbae6 100644
--- a/src/Packagist/WebBundle/Resources/views/Group/index.html.twig
+++ b/src/Packagist/WebBundle/Resources/views/Group/index.html.twig
@@ -22,7 +22,7 @@
onsubmit="return confirm('Are you sure?');"
>
{{ form_widget(csrfForm.createView._token) }}
-
+
diff --git a/src/Packagist/WebBundle/Resources/views/Package/viewPackage.html.twig b/src/Packagist/WebBundle/Resources/views/Package/viewPackage.html.twig
index b9e73a72..97e4f569 100644
--- a/src/Packagist/WebBundle/Resources/views/Package/viewPackage.html.twig
+++ b/src/Packagist/WebBundle/Resources/views/Package/viewPackage.html.twig
@@ -121,7 +121,7 @@
{% endif %}
- {% set repoUrl = package.repository|replace({'git://github.com/': 'https://github.com/', 'git@github.com:': 'https://github.com/'}) %}
+ {% set repoUrl = package.browsableRepository %}
{{ repoUrl|replace({'https://':'', 'http://':''}) }}
diff --git a/src/Packagist/WebBundle/Resources/views/User/list.html.twig b/src/Packagist/WebBundle/Resources/views/User/list.html.twig
index 382e49a7..7c238d70 100644
--- a/src/Packagist/WebBundle/Resources/views/User/list.html.twig
+++ b/src/Packagist/WebBundle/Resources/views/User/list.html.twig
@@ -14,9 +14,9 @@
{% if user.enabled %}
-
Enable
+
Enable
{% else %}
-
Disable
+
Disable
{% endif %}
@@ -27,7 +27,7 @@
diff --git a/src/Packagist/WebBundle/Resources/views/layout.html.twig b/src/Packagist/WebBundle/Resources/views/layout.html.twig
index 9831fbeb..939ae7f2 100644
--- a/src/Packagist/WebBundle/Resources/views/layout.html.twig
+++ b/src/Packagist/WebBundle/Resources/views/layout.html.twig
@@ -76,11 +76,11 @@