From 5f665c70e5b4c97737b665e6c3c18a6acf7bf8ce Mon Sep 17 00:00:00 2001 From: sharif Date: Thu, 26 Jul 2018 12:46:17 +0100 Subject: [PATCH 1/6] support php7.0 support php7.0 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 1840dcc..0e0ae0a 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,7 @@ } ], "require": { - "php": "^7.1" + "php": "^7.0" }, "require-dev": { "phpunit/phpunit": "^6" From 70d04a3f1ef27d423136d4c16a0f5aa9e916dd33 Mon Sep 17 00:00:00 2001 From: sharif-uddin1 Date: Thu, 26 Jul 2018 13:44:29 +0100 Subject: [PATCH 2/6] version php --- composer.json | 73 ++++++++++++++++++++++++++++----------------------- 1 file changed, 40 insertions(+), 33 deletions(-) diff --git a/composer.json b/composer.json index 1840dcc..40dbbb9 100644 --- a/composer.json +++ b/composer.json @@ -1,34 +1,41 @@ { - "name": "makasim/values", - "type": "library", - "description": "An alter ego object. It is an object and an array at the same time", - "keywords": ["model"], - "license": "MIT", - "authors": [ - { - "name": "Maksym Kotliar", - "email": "kotlyar.maksim@gmail.com" - } - ], - "require": { - "php": "^7.1" - }, - "require-dev": { - "phpunit/phpunit": "^6" - }, - "config": { - "bin-dir": "bin" - }, - "autoload": { - "psr-4": { "Makasim\\Values\\": "src" }, - "files": ["src/functions_include.php"] - }, - "autoload-dev": { - "psr-4": { "Makasim\\Values\\Tests\\": "tests" } - }, - "extra": { - "branch-alias": { - "dev-master": "0.5-dev" - } - } -} + "name" : "makasim/values", + "type" : "library", + "description" : "An alter ego object. It is an object and an array at the same time", + "keywords" : [ + "model" + ], + "license" : "MIT", + "authors" : [{ + "name" : "Maksym Kotliar", + "email" : "kotlyar.maksim@gmail.com" + } + ], + "require" : { + "php" : "^7.0" + }, + "require-dev" : { + "phpunit/phpunit" : "^6" + }, + "config" : { + "bin-dir" : "bin" + }, + "autoload" : { + "psr-4" : { + "Makasim\\Values\\" : "src" + }, + "files" : [ + "src/functions_include.php" + ] + }, + "autoload-dev" : { + "psr-4" : { + "Makasim\\Values\\Tests\\" : "tests" + } + }, + "extra" : { + "branch-alias" : { + "dev-master" : "0.5-dev" + } + } +} \ No newline at end of file From ee52fe5c34cd7c05eb6980cafbd7c5fab4bed9fe Mon Sep 17 00:00:00 2001 From: sharif-uddin1 Date: Thu, 26 Jul 2018 14:01:06 +0100 Subject: [PATCH 3/6] remove public from const --- src/HooksEnum.php | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/HooksEnum.php b/src/HooksEnum.php index fd4b0aa..8eccdca 100644 --- a/src/HooksEnum.php +++ b/src/HooksEnum.php @@ -4,17 +4,17 @@ class HooksEnum { - public const PRE_SET_VALUE = 'pre_set_value'; - public const PRE_ADD_VALUE = 'pre_add_value'; - public const POST_SET_VALUE = 'post_set_value'; - public const POST_SET_VALUES = 'post_set_values'; - public const POST_ADD_VALUE = 'post_add_values'; - public const POST_GET_VALUE = 'post_get_value'; + const PRE_SET_VALUE = 'pre_set_value'; + const PRE_ADD_VALUE = 'pre_add_value'; + const POST_SET_VALUE = 'post_set_value'; + const POST_SET_VALUES = 'post_set_values'; + const POST_ADD_VALUE = 'post_add_values'; + const POST_GET_VALUE = 'post_get_value'; - public const POST_SET_OBJECT = 'post_set_object'; - public const POST_ADD_OBJECT = 'post_add_object'; - public const POST_BUILD_OBJECT = 'post_build_object'; - public const POST_BUILD_SUB_OBJECT = 'post_build_sub_object'; - public const GET_OBJECT_CLASS = 'get_object_class'; - public const BUILD_OBJECT = 'build_object'; + const POST_SET_OBJECT = 'post_set_object'; + const POST_ADD_OBJECT = 'post_add_object'; + const POST_BUILD_OBJECT = 'post_build_object'; + const POST_BUILD_SUB_OBJECT = 'post_build_sub_object'; + const GET_OBJECT_CLASS = 'get_object_class'; + const BUILD_OBJECT = 'build_object'; } From 956074b45bcd8114864636008a377d8d930f10b8 Mon Sep 17 00:00:00 2001 From: michael-whittle1 Date: Thu, 26 Jul 2018 17:13:48 +0200 Subject: [PATCH 4/6] fixed file --- composer.json | 33 --------------------------------- 1 file changed, 33 deletions(-) diff --git a/composer.json b/composer.json index 9c3b3bd..fe43026 100644 --- a/composer.json +++ b/composer.json @@ -38,37 +38,4 @@ "dev-master" : "0.5-dev" } } -} - "name": "makasim/values", - "type": "library", - "description": "An alter ego object. It is an object and an array at the same time", - "keywords": ["model"], - "license": "MIT", - "authors": [ - { - "name": "Maksym Kotliar", - "email": "kotlyar.maksim@gmail.com" - } - ], - "require": { - "php": "^7.0" - }, - "require-dev": { - "phpunit/phpunit": "^6" - }, - "config": { - "bin-dir": "bin" - }, - "autoload": { - "psr-4": { "Makasim\\Values\\": "src" }, - "files": ["src/functions_include.php"] - }, - "autoload-dev": { - "psr-4": { "Makasim\\Values\\Tests\\": "tests" } - }, - "extra": { - "branch-alias": { - "dev-master": "0.5-dev" - } - } } From 019c50687d51f816e777a5f89821f1a4dfd49930 Mon Sep 17 00:00:00 2001 From: sharif Date: Thu, 26 Jul 2018 17:08:55 +0100 Subject: [PATCH 5/6] undo list undo list --- src/functions/objects.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/functions/objects.php b/src/functions/objects.php index 72554dd..c0f5fe9 100644 --- a/src/functions/objects.php +++ b/src/functions/objects.php @@ -179,7 +179,7 @@ function propagate_root($object, $parentObject, $parentKey) return; } - [$rootObject, $rootObjectKey] = call($parentObject, $parentKey, function($parentKey) { + list($rootObject, $rootObjectKey) = call($parentObject, $parentKey, function($parentKey) { return [ isset($this->rootObject) ?: $this, isset($this->rootObjectKey) ? $this->rootObjectKey.'.'.$parentKey : $parentKey From 5833b4a48b4f5913e667949ead8789f53eedc91c Mon Sep 17 00:00:00 2001 From: shorif2000 Date: Mon, 30 Jul 2018 15:07:09 +0000 Subject: [PATCH 6/6] restored file --- composer.json | 71 +++++++++++++++++++++++---------------------------- 1 file changed, 32 insertions(+), 39 deletions(-) diff --git a/composer.json b/composer.json index fe43026..1840dcc 100644 --- a/composer.json +++ b/composer.json @@ -1,41 +1,34 @@ { - "name" : "makasim/values", - "type" : "library", - "description" : "An alter ego object. It is an object and an array at the same time", - "keywords" : [ - "model" - ], - "license" : "MIT", - "authors" : [{ - "name" : "Maksym Kotliar", - "email" : "kotlyar.maksim@gmail.com" - } - ], - "require" : { - "php" : "^7.0" - }, - "require-dev" : { - "phpunit/phpunit" : "^6" - }, - "config" : { - "bin-dir" : "bin" - }, - "autoload" : { - "psr-4" : { - "Makasim\\Values\\" : "src" - }, - "files" : [ - "src/functions_include.php" - ] - }, - "autoload-dev" : { - "psr-4" : { - "Makasim\\Values\\Tests\\" : "tests" - } - }, - "extra" : { - "branch-alias" : { - "dev-master" : "0.5-dev" - } - } + "name": "makasim/values", + "type": "library", + "description": "An alter ego object. It is an object and an array at the same time", + "keywords": ["model"], + "license": "MIT", + "authors": [ + { + "name": "Maksym Kotliar", + "email": "kotlyar.maksim@gmail.com" + } + ], + "require": { + "php": "^7.1" + }, + "require-dev": { + "phpunit/phpunit": "^6" + }, + "config": { + "bin-dir": "bin" + }, + "autoload": { + "psr-4": { "Makasim\\Values\\": "src" }, + "files": ["src/functions_include.php"] + }, + "autoload-dev": { + "psr-4": { "Makasim\\Values\\Tests\\": "tests" } + }, + "extra": { + "branch-alias": { + "dev-master": "0.5-dev" + } + } }