~fkooman/vpn-user-portal

d2fc1f7489cdfb22d689f3fc52feb2a07ba40986 — François Kooman 2 years ago c24cbc5 v1
point to local copy of eduvpn/common
2 files changed, 73 insertions(+), 77 deletions(-)

M composer.json
M composer.lock
M composer.json => composer.json +3 -4
@@ 24,9 24,8 @@
    "name": "eduvpn/vpn-user-portal",
    "repositories": [
        {
            "no-api": true,
            "type": "vcs",
            "url": "https://github.com/eduvpn/vpn-lib-common"
            "type": "path",
            "url": "../vpn-lib-common"
        },
        {
            "type": "vcs",


@@ 35,7 34,7 @@
    ],
    "require": {
        "bacon/bacon-qr-code": "^1.0",
        "eduvpn/common": "^1",
        "eduvpn/common": "v1.x-dev",
        "ext-date": "*",
        "ext-json": "*",
        "ext-pcre": "*",

M composer.lock => composer.lock +70 -73
@@ 4,7 4,7 @@
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
        "This file is @generated automatically"
    ],
    "content-hash": "beb25a49053498f834b402bbb7e2b615",
    "content-hash": "1a8696c59a7cbe4ae0b4c55830341f43",
    "packages": [
        {
            "name": "bacon/bacon-qr-code",


@@ 54,17 54,11 @@
        },
        {
            "name": "eduvpn/common",
            "version": "1.3.2",
            "source": {
                "type": "git",
                "url": "https://github.com/eduvpn/vpn-lib-common",
                "reference": "0fe45ab84918a8cd07d075c7e72f052ae45d394c"
            },
            "version": "1.x-dev",
            "dist": {
                "type": "zip",
                "url": "https://api.github.com/repos/eduvpn/vpn-lib-common/zipball/0fe45ab84918a8cd07d075c7e72f052ae45d394c",
                "reference": "0fe45ab84918a8cd07d075c7e72f052ae45d394c",
                "shasum": ""
                "type": "path",
                "url": "../vpn-lib-common",
                "reference": "0fe45ab84918a8cd07d075c7e72f052ae45d394c"
            },
            "require": {
                "ext-curl": "*",


@@ 112,8 106,7 @@
            "support": {
                "email": "eduvpn@surfnet.nl",
                "source": "https://github.com/eduvpn/vpn-lib-common"
            },
            "time": "2018-12-05T10:31:12+00:00"
            }
        },
        {
            "name": "fkooman/oauth2-client",


@@ 453,16 446,16 @@
        },
        {
            "name": "symfony/polyfill-ctype",
            "version": "v1.10.0",
            "version": "v1.11.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/polyfill-ctype.git",
                "reference": "e3d826245268269cd66f8326bd8bc066687b4a19"
                "reference": "82ebae02209c21113908c229e9883c419720738a"
            },
            "dist": {
                "type": "zip",
                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/e3d826245268269cd66f8326bd8bc066687b4a19",
                "reference": "e3d826245268269cd66f8326bd8bc066687b4a19",
                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/82ebae02209c21113908c229e9883c419720738a",
                "reference": "82ebae02209c21113908c229e9883c419720738a",
                "shasum": ""
            },
            "require": {


@@ 474,7 467,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
                    "dev-master": "1.9-dev"
                    "dev-master": "1.11-dev"
                }
            },
            "autoload": {


@@ 507,20 500,20 @@
                "polyfill",
                "portable"
            ],
            "time": "2018-08-06T14:22:27+00:00"
            "time": "2019-02-06T07:57:58+00:00"
        },
        {
            "name": "symfony/polyfill-php56",
            "version": "v1.10.0",
            "version": "v1.11.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/polyfill-php56.git",
                "reference": "ff208829fe1aa48ab9af356992bb7199fed551af"
                "reference": "f4dddbc5c3471e1b700a147a20ae17cdb72dbe42"
            },
            "dist": {
                "type": "zip",
                "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/ff208829fe1aa48ab9af356992bb7199fed551af",
                "reference": "ff208829fe1aa48ab9af356992bb7199fed551af",
                "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/f4dddbc5c3471e1b700a147a20ae17cdb72dbe42",
                "reference": "f4dddbc5c3471e1b700a147a20ae17cdb72dbe42",
                "shasum": ""
            },
            "require": {


@@ 530,7 523,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
                    "dev-master": "1.9-dev"
                    "dev-master": "1.11-dev"
                }
            },
            "autoload": {


@@ 563,20 556,20 @@
                "portable",
                "shim"
            ],
            "time": "2018-09-21T06:26:08+00:00"
            "time": "2019-02-06T07:57:58+00:00"
        },
        {
            "name": "symfony/polyfill-util",
            "version": "v1.10.0",
            "version": "v1.11.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/polyfill-util.git",
                "reference": "3b58903eae668d348a7126f999b0da0f2f93611c"
                "reference": "b46c6cae28a3106735323f00a0c38eccf2328897"
            },
            "dist": {
                "type": "zip",
                "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/3b58903eae668d348a7126f999b0da0f2f93611c",
                "reference": "3b58903eae668d348a7126f999b0da0f2f93611c",
                "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/b46c6cae28a3106735323f00a0c38eccf2328897",
                "reference": "b46c6cae28a3106735323f00a0c38eccf2328897",
                "shasum": ""
            },
            "require": {


@@ 585,7 578,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
                    "dev-master": "1.9-dev"
                    "dev-master": "1.11-dev"
                }
            },
            "autoload": {


@@ 615,7 608,7 @@
                "polyfill",
                "shim"
            ],
            "time": "2018-09-30T16:36:12+00:00"
            "time": "2019-02-08T14:16:39+00:00"
        },
        {
            "name": "twig/extensions",


@@ 674,16 667,16 @@
        },
        {
            "name": "twig/twig",
            "version": "v1.38.2",
            "version": "v1.40.1",
            "source": {
                "type": "git",
                "url": "https://github.com/twigphp/Twig.git",
                "reference": "874adbd9222f928f6998732b25b01b41dff15b0c"
                "reference": "35889516bbd6bbe46a600c2c33b03515df4a076e"
            },
            "dist": {
                "type": "zip",
                "url": "https://api.github.com/repos/twigphp/Twig/zipball/874adbd9222f928f6998732b25b01b41dff15b0c",
                "reference": "874adbd9222f928f6998732b25b01b41dff15b0c",
                "url": "https://api.github.com/repos/twigphp/Twig/zipball/35889516bbd6bbe46a600c2c33b03515df4a076e",
                "reference": "35889516bbd6bbe46a600c2c33b03515df4a076e",
                "shasum": ""
            },
            "require": {


@@ 698,7 691,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
                    "dev-master": "1.38-dev"
                    "dev-master": "1.40-dev"
                }
            },
            "autoload": {


@@ 736,33 729,35 @@
            "keywords": [
                "templating"
            ],
            "time": "2019-03-12T18:45:24+00:00"
            "time": "2019-04-29T14:12:28+00:00"
        }
    ],
    "packages-dev": [
        {
            "name": "doctrine/instantiator",
            "version": "1.1.0",
            "version": "1.2.0",
            "source": {
                "type": "git",
                "url": "https://github.com/doctrine/instantiator.git",
                "reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda"
                "reference": "a2c590166b2133a4633738648b6b064edae0814a"
            },
            "dist": {
                "type": "zip",
                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda",
                "reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda",
                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/a2c590166b2133a4633738648b6b064edae0814a",
                "reference": "a2c590166b2133a4633738648b6b064edae0814a",
                "shasum": ""
            },
            "require": {
                "php": "^7.1"
            },
            "require-dev": {
                "athletic/athletic": "~0.1.8",
                "doctrine/coding-standard": "^6.0",
                "ext-pdo": "*",
                "ext-phar": "*",
                "phpunit/phpunit": "^6.2.3",
                "squizlabs/php_codesniffer": "^3.0.2"
                "phpbench/phpbench": "^0.13",
                "phpstan/phpstan-phpunit": "^0.11",
                "phpstan/phpstan-shim": "^0.11",
                "phpunit/phpunit": "^7.0"
            },
            "type": "library",
            "extra": {


@@ 787,25 782,25 @@
                }
            ],
            "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
            "homepage": "https://github.com/doctrine/instantiator",
            "homepage": "https://www.doctrine-project.org/projects/instantiator.html",
            "keywords": [
                "constructor",
                "instantiate"
            ],
            "time": "2017-07-22T11:58:36+00:00"
            "time": "2019-03-17T17:37:11+00:00"
        },
        {
            "name": "myclabs/deep-copy",
            "version": "1.8.1",
            "version": "1.9.1",
            "source": {
                "type": "git",
                "url": "https://github.com/myclabs/DeepCopy.git",
                "reference": "3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8"
                "reference": "e6828efaba2c9b79f4499dae1d66ef8bfa7b2b72"
            },
            "dist": {
                "type": "zip",
                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8",
                "reference": "3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8",
                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/e6828efaba2c9b79f4499dae1d66ef8bfa7b2b72",
                "reference": "e6828efaba2c9b79f4499dae1d66ef8bfa7b2b72",
                "shasum": ""
            },
            "require": {


@@ 840,7 835,7 @@
                "object",
                "object graph"
            ],
            "time": "2018-06-11T23:09:50+00:00"
            "time": "2019-04-07T13:18:21+00:00"
        },
        {
            "name": "phar-io/manifest",


@@ 1000,16 995,16 @@
        },
        {
            "name": "phpdocumentor/reflection-docblock",
            "version": "4.3.0",
            "version": "4.3.1",
            "source": {
                "type": "git",
                "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
                "reference": "94fd0001232e47129dd3504189fa1c7225010d08"
                "reference": "bdd9f737ebc2a01c06ea7ff4308ec6697db9b53c"
            },
            "dist": {
                "type": "zip",
                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/94fd0001232e47129dd3504189fa1c7225010d08",
                "reference": "94fd0001232e47129dd3504189fa1c7225010d08",
                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/bdd9f737ebc2a01c06ea7ff4308ec6697db9b53c",
                "reference": "bdd9f737ebc2a01c06ea7ff4308ec6697db9b53c",
                "shasum": ""
            },
            "require": {


@@ 1047,7 1042,7 @@
                }
            ],
            "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
            "time": "2017-11-30T07:14:17+00:00"
            "time": "2019-04-30T17:48:53+00:00"
        },
        {
            "name": "phpdocumentor/type-resolver",


@@ 1413,16 1408,16 @@
        },
        {
            "name": "phpunit/phpunit",
            "version": "7.5.7",
            "version": "7.5.9",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/phpunit.git",
                "reference": "eb343b86753d26de07ecba7868fa983104361948"
                "reference": "134669cf0eeac3f79bc7f0c793efbc158bffc160"
            },
            "dist": {
                "type": "zip",
                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/eb343b86753d26de07ecba7868fa983104361948",
                "reference": "eb343b86753d26de07ecba7868fa983104361948",
                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/134669cf0eeac3f79bc7f0c793efbc158bffc160",
                "reference": "134669cf0eeac3f79bc7f0c793efbc158bffc160",
                "shasum": ""
            },
            "require": {


@@ 1493,7 1488,7 @@
                "testing",
                "xunit"
            ],
            "time": "2019-03-16T07:31:17+00:00"
            "time": "2019-04-19T15:50:46+00:00"
        },
        {
            "name": "sebastian/code-unit-reverse-lookup",


@@ 1662,16 1657,16 @@
        },
        {
            "name": "sebastian/environment",
            "version": "4.1.0",
            "version": "4.2.2",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/environment.git",
                "reference": "6fda8ce1974b62b14935adc02a9ed38252eca656"
                "reference": "f2a2c8e1c97c11ace607a7a667d73d47c19fe404"
            },
            "dist": {
                "type": "zip",
                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/6fda8ce1974b62b14935adc02a9ed38252eca656",
                "reference": "6fda8ce1974b62b14935adc02a9ed38252eca656",
                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/f2a2c8e1c97c11ace607a7a667d73d47c19fe404",
                "reference": "f2a2c8e1c97c11ace607a7a667d73d47c19fe404",
                "shasum": ""
            },
            "require": {


@@ 1686,7 1681,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
                    "dev-master": "4.1-dev"
                    "dev-master": "4.2-dev"
                }
            },
            "autoload": {


@@ 1711,7 1706,7 @@
                "environment",
                "hhvm"
            ],
            "time": "2019-02-01T05:27:49+00:00"
            "time": "2019-05-05T09:05:15+00:00"
        },
        {
            "name": "sebastian/exporter",


@@ 2063,16 2058,16 @@
        },
        {
            "name": "theseer/tokenizer",
            "version": "1.1.0",
            "version": "1.1.2",
            "source": {
                "type": "git",
                "url": "https://github.com/theseer/tokenizer.git",
                "reference": "cb2f008f3f05af2893a87208fe6a6c4985483f8b"
                "reference": "1c42705be2b6c1de5904f8afacef5895cab44bf8"
            },
            "dist": {
                "type": "zip",
                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/cb2f008f3f05af2893a87208fe6a6c4985483f8b",
                "reference": "cb2f008f3f05af2893a87208fe6a6c4985483f8b",
                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/1c42705be2b6c1de5904f8afacef5895cab44bf8",
                "reference": "1c42705be2b6c1de5904f8afacef5895cab44bf8",
                "shasum": ""
            },
            "require": {


@@ 2099,7 2094,7 @@
                }
            ],
            "description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
            "time": "2017-04-07T12:08:54+00:00"
            "time": "2019-04-04T09:56:43+00:00"
        },
        {
            "name": "webmozart/assert",


@@ 2155,7 2150,9 @@
    ],
    "aliases": [],
    "minimum-stability": "stable",
    "stability-flags": [],
    "stability-flags": {
        "eduvpn/common": 20
    },
    "prefer-stable": false,
    "prefer-lowest": false,
    "platform": {