From fe8b07f5c701ce0bcb62fa101dbd77a74a9aa6c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C5=82awomir=20Kaleta?= Date: Fri, 28 Aug 2020 21:48:43 +0200 Subject: [PATCH] Resolved #32, Update dframe v4.1.3 --- composer.json | 2 +- composer.lock | 69 ++++++++++++--------------------------------------- 2 files changed, 17 insertions(+), 54 deletions(-) diff --git a/composer.json b/composer.json index db99bc3..2fc06a2 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,7 @@ } }, "require": { - "dframe/dframe": "v4.1", + "dframe/dframe": "^v4.1", "dframe/database": "^v2.0", "smarty/smarty": "^3.1", "dframe/mymail": "^2.0", diff --git a/composer.lock b/composer.lock index 5066ad1..7b4ff56 100644 --- a/composer.lock +++ b/composer.lock @@ -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": "670c6b36631c9272fa27f03390891d6a", + "content-hash": "62041188227eff391f7d4070b49b404d", "packages": [ { "name": "dframe/cli", @@ -52,52 +52,6 @@ ], "time": "2018-10-14T12:33:23+00:00" }, - { - "name": "dframe/config", - "version": "v4.1.0", - "source": { - "type": "git", - "url": "https://github.com/dframe/config.git", - "reference": "ab38345f8313286891dd0351c5b03fe325ba3a7c" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/dframe/config/zipball/ab38345f8313286891dd0351c5b03fe325ba3a7c", - "reference": "ab38345f8313286891dd0351c5b03fe325ba3a7c", - "shasum": "" - }, - "require": { - "ext-json": "*", - "php": ">=7.0" - }, - "require-dev": { - "mikey179/vfsstream": "^1.6", - "phpunit/phpunit": "^6.5" - }, - "type": "library", - "autoload": { - "psr-4": { - "Dframe\\Component\\Config\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "SÅ‚awomir Kaleta", - "email": "slaszka@gmail.com" - } - ], - "description": "Config component Dframe", - "homepage": "https://dframeframework.com/en/docs/dframe/master/config/overview", - "keywords": [ - "dframe", - "php config" - ], - "time": "2020-04-14T09:03:39+00:00" - }, { "name": "dframe/database", "version": "v2.0.0", @@ -152,26 +106,35 @@ }, { "name": "dframe/dframe", - "version": "v4.1.0", + "version": "v4.1.3", "source": { "type": "git", "url": "https://github.com/dframe/dframe.git", - "reference": "8e327fd3eb700b9ca047b2e4a63968c69c85093b" + "reference": "a2ca138452752215a62843ad3590c8fe8000f22c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dframe/dframe/zipball/8e327fd3eb700b9ca047b2e4a63968c69c85093b", - "reference": "8e327fd3eb700b9ca047b2e4a63968c69c85093b", + "url": "https://api.github.com/repos/dframe/dframe/zipball/a2ca138452752215a62843ad3590c8fe8000f22c", + "reference": "a2ca138452752215a62843ad3590c8fe8000f22c", "shasum": "" }, "require": { - "dframe/config": "^4.0", "ext-json": "*", "php": ">=7.3", "psr/simple-cache": "^1.0" }, + "replace": { + "dframe/config": "self.version", + "dframe/cron": "self.version", + "dframe/loader": "self.version", + "dframe/router": "self.version", + "dframe/session": "self.version", + "dframe/token": "self.version", + "dframe/view": "self.version" + }, "require-dev": { "kriswallsmith/assetic": "^1.4", + "mikey179/vfsstream": "^1.6", "natxet/cssmin": "^3.0", "patchwork/jsqueeze": "^2.0", "phpunit/phpunit": "^8.3", @@ -214,7 +177,7 @@ "mvc", "php" ], - "time": "2020-08-19T14:51:20+00:00" + "time": "2020-08-28T19:35:09+00:00" }, { "name": "dframe/mymail",