From 1d1d8a8448d207742f5c43fac105bbf54df7d216 Mon Sep 17 00:00:00 2001 From: Riddhesh Sanghvi Date: Thu, 8 Aug 2024 10:23:14 +0530 Subject: [PATCH 1/9] Extend only valid extension files Signed-off-by: Riddhesh Sanghvi --- php/class-ee-docker.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/php/class-ee-docker.php b/php/class-ee-docker.php index 058d354d7..d1deacbfb 100644 --- a/php/class-ee-docker.php +++ b/php/class-ee-docker.php @@ -39,11 +39,10 @@ public static function docker_compose_with_custom( array $files_before_custom = } else { if ( $fs->exists( SITE_CUSTOM_DOCKER_COMPOSE_DIR ) ) { - $custom_compose_files = array_diff( scandir( SITE_CUSTOM_DOCKER_COMPOSE_DIR ), [ '.', '..' ] ); - $custom_compose_files = array_map( function ( $arrayValues ) { + $ymlFiles = glob( SITE_CUSTOM_DOCKER_COMPOSE_DIR . '/*.yml' ); + $yamlFiles = glob( SITE_CUSTOM_DOCKER_COMPOSE_DIR . '/*.yaml' ); - return SITE_CUSTOM_DOCKER_COMPOSE_DIR . '/' . $arrayValues; - }, $custom_compose_files ); + $custom_compose_files = array_merge( $ymlFiles, $yamlFiles ); $files_before_custom = array_unique( array_merge( $files_before_custom, $custom_compose_files ) ); } From ea9b415ca36dff2f24e1d53aede2ce60938bc23a Mon Sep 17 00:00:00 2001 From: Riddhesh Sanghvi Date: Thu, 8 Aug 2024 10:36:19 +0530 Subject: [PATCH 2/9] Add minimum 5GB disk requirement for update Signed-off-by: Riddhesh Sanghvi --- php/EE/Runner.php | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/php/EE/Runner.php b/php/EE/Runner.php index a672f43c4..7ad2e2bef 100644 --- a/php/EE/Runner.php +++ b/php/EE/Runner.php @@ -134,6 +134,15 @@ public function check_requirements( $show_error = true ) { */ private function migrate() { + // Check if minimum 5GB disk space is available + $free_space = disk_free_space( EE_ROOT_DIR ); + $docker_dir = EE::launch( 'docker info --format \'{{.DockerRootDir}}\'' )->stdout; + $free_space_docker = disk_free_space( $docker_dir ); + + if ( $free_space < 5 * 1024 * 1024 * 1024 || $free_space_docker < 5 * 1024 * 1024 * 1024 ) { + EE::error( 'EasyEngine update requires minimum 5GB disk space to run. Please free up some space and try again.' ); + } + $rsp = new \EE\RevertableStepProcessor(); $rsp->add_step( 'ee-db-migrations', 'EE\Migration\Executor::execute_migrations' ); From c5e4c6810d2889143cd895d0c627aef0391fd6b9 Mon Sep 17 00:00:00 2001 From: Riddhesh Sanghvi Date: Thu, 8 Aug 2024 11:45:42 +0530 Subject: [PATCH 3/9] Update space check Signed-off-by: Riddhesh Sanghvi --- php/EE/Runner.php | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/php/EE/Runner.php b/php/EE/Runner.php index 7ad2e2bef..be5acbf91 100644 --- a/php/EE/Runner.php +++ b/php/EE/Runner.php @@ -135,11 +135,21 @@ public function check_requirements( $show_error = true ) { private function migrate() { // Check if minimum 5GB disk space is available - $free_space = disk_free_space( EE_ROOT_DIR ); - $docker_dir = EE::launch( 'docker info --format \'{{.DockerRootDir}}\'' )->stdout; - $free_space_docker = disk_free_space( $docker_dir ); + $required_space = 5 * 1024 * 1024 * 1024; + $free_space = 0; + $free_space_docker = 0; - if ( $free_space < 5 * 1024 * 1024 * 1024 || $free_space_docker < 5 * 1024 * 1024 * 1024 ) { + if ( is_dir( EE_ROOT_DIR ) ) { + $free_space = disk_free_space( EE_ROOT_DIR ); + } + + $docker_dir = EE::launch( 'docker info --format \'{{.DockerRootDir}}\'' )->stdout; + + if ( is_dir( $docker_dir ) ) { + $free_space_docker = disk_free_space( $docker_dir ); + } + + if ( ( $free_space < $required_space && is_dir( EE_ROOT_DIR ) ) || ( $free_space_docker < $required_space && is_dir( $docker_dir ) ) ) { EE::error( 'EasyEngine update requires minimum 5GB disk space to run. Please free up some space and try again.' ); } From d4a3170304744a8bec1dcae5b163c501f6b3432e Mon Sep 17 00:00:00 2001 From: Riddhesh Sanghvi Date: Thu, 8 Aug 2024 16:05:31 +0530 Subject: [PATCH 4/9] Fix stdout output Signed-off-by: Riddhesh Sanghvi --- php/EE/Runner.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/php/EE/Runner.php b/php/EE/Runner.php index 7ad2e2bef..b2088ec44 100644 --- a/php/EE/Runner.php +++ b/php/EE/Runner.php @@ -136,7 +136,7 @@ private function migrate() { // Check if minimum 5GB disk space is available $free_space = disk_free_space( EE_ROOT_DIR ); - $docker_dir = EE::launch( 'docker info --format \'{{.DockerRootDir}}\'' )->stdout; + $docker_dir = trim( EE::launch( 'docker info --format \'{{.DockerRootDir}}\'' )->stdout ); $free_space_docker = disk_free_space( $docker_dir ); if ( $free_space < 5 * 1024 * 1024 * 1024 || $free_space_docker < 5 * 1024 * 1024 * 1024 ) { From ef746219b1973963c5008e737f3f2d51dc04d7ab Mon Sep 17 00:00:00 2001 From: Riddhesh Sanghvi Date: Thu, 8 Aug 2024 16:06:04 +0530 Subject: [PATCH 5/9] Update username generation Signed-off-by: Riddhesh Sanghvi --- php/utils.php | 79 ++++++++++++++++++++++++--------------------------- 1 file changed, 37 insertions(+), 42 deletions(-) diff --git a/php/utils.php b/php/utils.php index 4c2ca61b9..985f9802a 100644 --- a/php/utils.php +++ b/php/utils.php @@ -1408,7 +1408,7 @@ function delete_dir( $dir ) { * * @return string Random Password of specified length. */ -function random_password( $length = 12 ) { +function random_password( $length = 18 ) { $alphabet = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890'; $pass = array(); $alphaLength = strlen( $alphabet ) - 1; @@ -1691,47 +1691,42 @@ function extract_zip( $zip_file, $path_to_extract ) { */ function random_name_generator() { - $left = [ - 'admiring', 'adoring', 'affectionate', 'agitated', 'amazing', 'angry', 'awesome', 'blissful', 'bold', - 'boring', 'brave', 'charming', 'clever', 'cocky', 'cool', 'compassionate', 'competent', 'condescending', - 'confident', 'cranky', 'crazy', 'dazzling', 'determined', 'distracted', 'dreamy', 'eager', 'ecstatic', - 'elastic', 'elated', 'elegant', 'eloquent', 'epic', 'fervent', 'festive', 'flamboyant', 'focused', 'friendly', - 'frosty', 'gallant', 'gifted', 'goofy', 'gracious', 'happy', 'hardcore', 'heuristic', 'hopeful', 'hungry', - 'infallible', 'inspiring', 'jolly', 'jovial', 'keen', 'kind', 'laughing', 'loving', 'lucid', 'magical', - 'mystifying', 'modest', 'musing', 'naughty', 'nervous', 'nifty', 'nostalgic', 'objective', 'optimistic', - 'peaceful', 'pedantic', 'pensive', 'practical', 'priceless', 'quirky', 'quizzical', 'recursing', 'relaxed', - 'reverent', 'romantic', 'sad', 'serene', 'sharp', 'silly', 'sleepy', 'stoic', 'stupefied', 'suspicious', - 'sweet', 'tender', 'thirsty', 'trusting', 'unruffled', 'upbeat', 'vibrant', 'vigilant', 'vigorous', - 'wizardly', 'wonderful', 'xenodochial', 'youthful', 'zealous', 'zen', - ]; - - $right = [ 'albattani', 'allen', 'almeida', 'antonelli', 'agnesi', 'archimedes', 'ardinghelli', 'aryabhata', - 'austin', 'babbage', 'banach', 'banzai', 'bardeen', 'bartik', 'bassi', 'beaver', 'bell', 'benz', 'bhabha', - 'bhaskara', 'black', 'blackburn', 'blackwell', 'bohr', 'booth', 'borg', 'bose', 'boyd', 'brahmagupta', - 'brattain', 'brown', 'burnell', 'buck', 'burnell', 'cannon', 'carson', 'cartwright', 'chandrasekhar', - 'chaplygin', 'chatelet', 'chatterjee', 'chebyshev', 'cocks', 'cohen', 'chaum', 'clarke', 'colden', 'cori', - 'cray', 'curran', 'curie', 'darwin', 'davinci', 'dewdney', 'dhawan', 'diffie', 'dijkstra', 'dirac', 'driscoll', - 'dubinsky', 'easley', 'edison', 'einstein', 'elbakyan', 'elgamal', 'elion', 'ellis', 'engelbart', 'euclid', - 'euler', 'faraday', 'feistel', 'fermat', 'fermi', 'feynman', 'franklin', 'gagarin', 'galileo', 'galois', - 'ganguly', 'gates', 'gauss', 'germain', 'goldberg', 'goldstine', 'goldwasser', 'golick', 'goodall', 'gould', - 'greider', 'grothendieck', 'haibt', 'hamilton', 'haslett', 'hawking', 'hellman', 'heisenberg', 'hermann', - 'herschel', 'hertz', 'heyrovsky', 'hodgkin', 'hofstadter', 'hoover', 'hopper', 'hugle', 'hypatia', 'ishizaka', - 'jackson', 'jang', 'jennings', 'jepsen', 'johnson', 'joliot', 'jones', 'kalam', 'kapitsa', 'kare', 'keldysh', - 'keller', 'kepler', 'khayyam', 'khorana', 'kilby', 'kirch', 'knuth', 'kowalevski', 'lalande', 'lamarr', - 'lamport', 'leakey', 'leavitt', 'lederberg', 'lehmann', 'lewin', 'lichterman', 'liskov', 'lovelace', 'lumiere', - 'mahavira', 'margulis', 'matsumoto', 'maxwell', 'mayer', 'mccarthy', 'mcclintock', 'mclaren', 'mclean', - 'mcnulty', 'mendel', 'mendeleev', 'meitner', 'meninsky', 'merkle', 'mestorf', 'minsky', 'mirzakhani', - 'moore', 'morse', 'murdock', 'moser', 'napier', 'nash', 'neumann', 'newton', 'nightingale', 'nobel', - 'noether', 'northcutt', 'noyce', 'panini', 'pare', 'pascal', 'pasteur', 'payne', 'perlman', 'pike', - 'poincare', 'poitras', 'proskuriakova', 'ptolemy', 'raman', 'ramanujan', 'ride', 'montalcini', 'ritchie', - 'rhodes', 'robinson', 'roentgen', 'rosalind', 'rubin', 'saha', 'sammet', 'sanderson', 'shannon', 'shaw', - 'shirley', 'shockley', 'shtern', 'sinoussi', 'snyder', 'solomon', 'spence', 'sutherland', 'stallman', - 'stonebraker', 'swanson', 'swartz', 'swirles', 'taussig', 'tereshkova', 'tesla', 'tharp', 'thompson', - 'torvalds', 'tu', 'turing', 'varahamihira', 'vaughan', 'visvesvaraya', 'volhard', 'villani', 'wescoff', - 'wiles', 'williams', 'williamson', 'wilson', 'wing', 'wozniak', 'wright', 'wu', 'yalow', 'yonath', "zhukovsky", - ]; - - return $left[ array_rand( $left ) ] . '-' . $right[ array_rand( $right ) ]; + $prefix = 'wp-user-'; + + // Generate a random suffix of 4 to 6 characters with a number at the 2nd or 3rd position. + $suffixLength = random_int( 4, 6 ); + $suffix = generate_safe_suffix( $suffixLength ); + + // Combine prefix and suffix to form the username + return $prefix . $suffix; +} + +/** + * Generate a safe random suffix with a number at the 2nd or 3rd position. + * + * @param int $length Length of the desired suffix. + * + * @return string + */ +function generate_safe_suffix( $length ) { + + $alphanumeric = 'abcdefghijklmnopqrstuvwxyz0123456789'; // Allowed alphanumeric characters + $numbers = '0123456789'; // Allowed numeric characters + + $randomSuffix = ''; + + // Randomly choose a position for the number (2nd or 3rd) + $numberPosition = random_int( 1, 2 ); + + for ( $i = 0; $i < $length; $i ++ ) { + if ( $i == $numberPosition ) { + $randomSuffix .= $numbers[ random_int( 0, strlen( $numbers ) - 1 ) ]; + } else { + $randomSuffix .= $alphanumeric[ random_int( 0, strlen( $alphanumeric ) - 1 ) ]; + } + } + + return $randomSuffix; } /** From 33f4023d9d8284043092d074d37f9f964abbdf6c Mon Sep 17 00:00:00 2001 From: Riddhesh Sanghvi Date: Thu, 8 Aug 2024 16:10:42 +0530 Subject: [PATCH 6/9] Merge develop into update/username-generation --- php/EE/Runner.php | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/php/EE/Runner.php b/php/EE/Runner.php index b2088ec44..1f22ac9cf 100644 --- a/php/EE/Runner.php +++ b/php/EE/Runner.php @@ -135,11 +135,21 @@ public function check_requirements( $show_error = true ) { private function migrate() { // Check if minimum 5GB disk space is available - $free_space = disk_free_space( EE_ROOT_DIR ); - $docker_dir = trim( EE::launch( 'docker info --format \'{{.DockerRootDir}}\'' )->stdout ); - $free_space_docker = disk_free_space( $docker_dir ); + $required_space = 5 * 1024 * 1024 * 1024; + $free_space = 0; + $free_space_docker = 0; - if ( $free_space < 5 * 1024 * 1024 * 1024 || $free_space_docker < 5 * 1024 * 1024 * 1024 ) { + if ( is_dir( EE_ROOT_DIR ) ) { + $free_space = disk_free_space( EE_ROOT_DIR ); + } + + $docker_dir = trim( EE::launch( 'docker info --format \'{{.DockerRootDir}}\'' )->stdout ); + + if ( is_dir( $docker_dir ) ) { + $free_space_docker = disk_free_space( $docker_dir ); + } + + if ( ( $free_space < $required_space && is_dir( EE_ROOT_DIR ) ) || ( $free_space_docker < $required_space && is_dir( $docker_dir ) ) ) { EE::error( 'EasyEngine update requires minimum 5GB disk space to run. Please free up some space and try again.' ); } From af0ab3a22f6862ad969bffaa41d7e7d85f1850e3 Mon Sep 17 00:00:00 2001 From: Riddhesh Sanghvi Date: Thu, 8 Aug 2024 16:52:12 +0530 Subject: [PATCH 7/9] Update images for v4.7.3 Signed-off-by: Riddhesh Sanghvi --- img-versions.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/img-versions.json b/img-versions.json index b0d531251..97f264cd0 100644 --- a/img-versions.json +++ b/img-versions.json @@ -1,9 +1,9 @@ { - "easyengine/cron": "v4.7.0", + "easyengine/cron": "v4.7.3", "easyengine/mailhog": "v4.6.5", "easyengine/mariadb": "v4.6.6", - "easyengine/nginx-proxy": "v4.7.1", - "easyengine/nginx": "v4.7.1", + "easyengine/nginx-proxy": "v4.7.3", + "easyengine/nginx": "v4.7.3", "easyengine/php": "v4.6.6", "easyengine/php5.6": "v4.6.6", "easyengine/php7.0": "v4.6.6", @@ -12,9 +12,9 @@ "easyengine/php7.4": "v4.7.2", "easyengine/php8.0": "v4.7.2", "easyengine/php8.1": "v4.7.2", - "easyengine/php8.2": "v4.7.2", - "easyengine/php8.3": "v4.7.2", - "easyengine/postfix": "v4.7.0", - "easyengine/redis": "v4.7.2", - "easyengine/newrelic-daemon": "v4.7.2" + "easyengine/php8.2": "v4.7.3", + "easyengine/php8.3": "v4.7.3", + "easyengine/postfix": "v4.7.3", + "easyengine/redis": "v4.7.3", + "easyengine/newrelic-daemon": "v4.7.3" } From 2e7fa2cea5a4a9c1dc610294d1e0725f57d3fcaf Mon Sep 17 00:00:00 2001 From: Riddhesh Sanghvi Date: Tue, 13 Aug 2024 18:11:06 +0530 Subject: [PATCH 8/9] Update composer packages for v4.7.3 Signed-off-by: Riddhesh Sanghvi --- composer.json | 2 +- composer.lock | 180 ++++++++++++++++++++++++-------------------------- 2 files changed, 89 insertions(+), 93 deletions(-) diff --git a/composer.json b/composer.json index a92ddfe67..41da279cd 100644 --- a/composer.json +++ b/composer.json @@ -29,7 +29,7 @@ "composer/semver": "3.2.4", "daverandom/libdns": "^2.0", "easyengine/admin-tools-command": "v1.1.0", - "easyengine/auth-command": "v1.2.0", + "easyengine/auth-command": "v1.2.1", "easyengine/config-command": "v1.0.2", "easyengine/cron-command": "v2.1.0", "easyengine/log-command": "v1.1.0", diff --git a/composer.lock b/composer.lock index 1d8af8bce..217c1adba 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": "8eae214044b252f779ad4cba1b243ab7", + "content-hash": "3e325ef56ea57dd09ceecd428afce3c1", "packages": [ { "name": "acmephp/core", @@ -199,16 +199,16 @@ }, { "name": "composer/ca-bundle", - "version": "1.5.0", + "version": "1.5.1", "source": { "type": "git", "url": "https://github.com/composer/ca-bundle.git", - "reference": "0c5ccfcfea312b5c5a190a21ac5cef93f74baf99" + "reference": "063d9aa8696582f5a41dffbbaf3c81024f0a604a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/ca-bundle/zipball/0c5ccfcfea312b5c5a190a21ac5cef93f74baf99", - "reference": "0c5ccfcfea312b5c5a190a21ac5cef93f74baf99", + "url": "https://api.github.com/repos/composer/ca-bundle/zipball/063d9aa8696582f5a41dffbbaf3c81024f0a604a", + "reference": "063d9aa8696582f5a41dffbbaf3c81024f0a604a", "shasum": "" }, "require": { @@ -218,7 +218,7 @@ }, "require-dev": { "phpstan/phpstan": "^1.10", - "psr/log": "^1.0", + "psr/log": "^1.0 || ^2.0 || ^3.0", "symfony/phpunit-bridge": "^4.2 || ^5", "symfony/process": "^4.0 || ^5.0 || ^6.0 || ^7.0" }, @@ -255,7 +255,7 @@ "support": { "irc": "irc://irc.freenode.org/composer", "issues": "https://github.com/composer/ca-bundle/issues", - "source": "https://github.com/composer/ca-bundle/tree/1.5.0" + "source": "https://github.com/composer/ca-bundle/tree/1.5.1" }, "funding": [ { @@ -271,7 +271,7 @@ "type": "tidelift" } ], - "time": "2024-03-15T14:00:32+00:00" + "time": "2024-07-08T15:28:20+00:00" }, { "name": "composer/composer", @@ -831,16 +831,16 @@ }, { "name": "easyengine/auth-command", - "version": "v1.2.0", + "version": "v1.2.1", "source": { "type": "git", "url": "https://github.com/EasyEngine/auth-command.git", - "reference": "e08f7e01d3d73d0ea61f1adfb73249af19e88cb7" + "reference": "009381e270ef415ad2b2f8a0da678459cb9bf4c9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/EasyEngine/auth-command/zipball/e08f7e01d3d73d0ea61f1adfb73249af19e88cb7", - "reference": "e08f7e01d3d73d0ea61f1adfb73249af19e88cb7", + "url": "https://api.github.com/repos/EasyEngine/auth-command/zipball/009381e270ef415ad2b2f8a0da678459cb9bf4c9", + "reference": "009381e270ef415ad2b2f8a0da678459cb9bf4c9", "shasum": "" }, "type": "ee-cli-package", @@ -875,9 +875,9 @@ "homepage": "https://github.com/easyengine/auth-command", "support": { "issues": "https://github.com/EasyEngine/auth-command/issues", - "source": "https://github.com/EasyEngine/auth-command/tree/v1.2.0" + "source": "https://github.com/EasyEngine/auth-command/tree/v1.2.1" }, - "time": "2021-11-02T09:18:13+00:00" + "time": "2024-08-13T12:39:42+00:00" }, { "name": "easyengine/config-command", @@ -1355,22 +1355,22 @@ }, { "name": "guzzlehttp/guzzle", - "version": "7.8.1", + "version": "7.8.2", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "41042bc7ab002487b876a0683fc8dce04ddce104" + "reference": "f4152d9eb85c445fe1f992001d1748e8bec070d2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/41042bc7ab002487b876a0683fc8dce04ddce104", - "reference": "41042bc7ab002487b876a0683fc8dce04ddce104", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/f4152d9eb85c445fe1f992001d1748e8bec070d2", + "reference": "f4152d9eb85c445fe1f992001d1748e8bec070d2", "shasum": "" }, "require": { "ext-json": "*", - "guzzlehttp/promises": "^1.5.3 || ^2.0.1", - "guzzlehttp/psr7": "^1.9.1 || ^2.5.1", + "guzzlehttp/promises": "^1.5.3 || ^2.0.3", + "guzzlehttp/psr7": "^1.9.1 || ^2.6.3", "php": "^7.2.5 || ^8.0", "psr/http-client": "^1.0", "symfony/deprecation-contracts": "^2.2 || ^3.0" @@ -1381,9 +1381,9 @@ "require-dev": { "bamarni/composer-bin-plugin": "^1.8.2", "ext-curl": "*", - "php-http/client-integration-tests": "dev-master#2c025848417c1135031fdf9c728ee53d0a7ceaee as 3.0.999", + "guzzle/client-integration-tests": "3.0.2", "php-http/message-factory": "^1.1", - "phpunit/phpunit": "^8.5.36 || ^9.6.15", + "phpunit/phpunit": "^8.5.39 || ^9.6.20", "psr/log": "^1.1 || ^2.0 || ^3.0" }, "suggest": { @@ -1461,7 +1461,7 @@ ], "support": { "issues": "https://github.com/guzzle/guzzle/issues", - "source": "https://github.com/guzzle/guzzle/tree/7.8.1" + "source": "https://github.com/guzzle/guzzle/tree/7.8.2" }, "funding": [ { @@ -1477,20 +1477,20 @@ "type": "tidelift" } ], - "time": "2023-12-03T20:35:24+00:00" + "time": "2024-07-18T11:12:18+00:00" }, { "name": "guzzlehttp/promises", - "version": "2.0.2", + "version": "2.0.3", "source": { "type": "git", "url": "https://github.com/guzzle/promises.git", - "reference": "bbff78d96034045e58e13dedd6ad91b5d1253223" + "reference": "6ea8dd08867a2a42619d65c3deb2c0fcbf81c8f8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/promises/zipball/bbff78d96034045e58e13dedd6ad91b5d1253223", - "reference": "bbff78d96034045e58e13dedd6ad91b5d1253223", + "url": "https://api.github.com/repos/guzzle/promises/zipball/6ea8dd08867a2a42619d65c3deb2c0fcbf81c8f8", + "reference": "6ea8dd08867a2a42619d65c3deb2c0fcbf81c8f8", "shasum": "" }, "require": { @@ -1498,7 +1498,7 @@ }, "require-dev": { "bamarni/composer-bin-plugin": "^1.8.2", - "phpunit/phpunit": "^8.5.36 || ^9.6.15" + "phpunit/phpunit": "^8.5.39 || ^9.6.20" }, "type": "library", "extra": { @@ -1544,7 +1544,7 @@ ], "support": { "issues": "https://github.com/guzzle/promises/issues", - "source": "https://github.com/guzzle/promises/tree/2.0.2" + "source": "https://github.com/guzzle/promises/tree/2.0.3" }, "funding": [ { @@ -1560,7 +1560,7 @@ "type": "tidelift" } ], - "time": "2023-12-03T20:19:20+00:00" + "time": "2024-07-18T10:29:17+00:00" }, { "name": "guzzlehttp/psr7", @@ -1669,20 +1669,20 @@ }, { "name": "justinrainbow/json-schema", - "version": "v5.2.13", + "version": "5.3.0", "source": { "type": "git", "url": "https://github.com/jsonrainbow/json-schema.git", - "reference": "fbbe7e5d79f618997bc3332a6f49246036c45793" + "reference": "feb2ca6dd1cebdaf1ed60a4c8de2e53ce11c4fd8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/jsonrainbow/json-schema/zipball/fbbe7e5d79f618997bc3332a6f49246036c45793", - "reference": "fbbe7e5d79f618997bc3332a6f49246036c45793", + "url": "https://api.github.com/repos/jsonrainbow/json-schema/zipball/feb2ca6dd1cebdaf1ed60a4c8de2e53ce11c4fd8", + "reference": "feb2ca6dd1cebdaf1ed60a4c8de2e53ce11c4fd8", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": ">=7.1" }, "require-dev": { "friendsofphp/php-cs-fixer": "~2.2.20||~2.15.1", @@ -1693,11 +1693,6 @@ "bin/validate-json" ], "type": "library", - "extra": { - "branch-alias": { - "dev-master": "5.0.x-dev" - } - }, "autoload": { "psr-4": { "JsonSchema\\": "src/JsonSchema/" @@ -1733,9 +1728,9 @@ ], "support": { "issues": "https://github.com/jsonrainbow/json-schema/issues", - "source": "https://github.com/jsonrainbow/json-schema/tree/v5.2.13" + "source": "https://github.com/jsonrainbow/json-schema/tree/5.3.0" }, - "time": "2023-09-26T02:20:38+00:00" + "time": "2024-07-06T21:00:26+00:00" }, { "name": "league/flysystem", @@ -2400,23 +2395,23 @@ }, { "name": "seld/jsonlint", - "version": "1.10.2", + "version": "1.11.0", "source": { "type": "git", "url": "https://github.com/Seldaek/jsonlint.git", - "reference": "9bb7db07b5d66d90f6ebf542f09fc67d800e5259" + "reference": "1748aaf847fc731cfad7725aec413ee46f0cc3a2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/9bb7db07b5d66d90f6ebf542f09fc67d800e5259", - "reference": "9bb7db07b5d66d90f6ebf542f09fc67d800e5259", + "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/1748aaf847fc731cfad7725aec413ee46f0cc3a2", + "reference": "1748aaf847fc731cfad7725aec413ee46f0cc3a2", "shasum": "" }, "require": { "php": "^5.3 || ^7.0 || ^8.0" }, "require-dev": { - "phpstan/phpstan": "^1.5", + "phpstan/phpstan": "^1.11", "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0 || ^8.5.13" }, "bin": [ @@ -2448,7 +2443,7 @@ ], "support": { "issues": "https://github.com/Seldaek/jsonlint/issues", - "source": "https://github.com/Seldaek/jsonlint/tree/1.10.2" + "source": "https://github.com/Seldaek/jsonlint/tree/1.11.0" }, "funding": [ { @@ -2460,7 +2455,7 @@ "type": "tidelift" } ], - "time": "2024-02-07T12:57:50+00:00" + "time": "2024-07-11T14:55:45+00:00" }, { "name": "seld/phar-utils", @@ -3190,16 +3185,16 @@ }, { "name": "symfony/polyfill-ctype", - "version": "v1.29.0", + "version": "v1.30.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4" + "reference": "0424dff1c58f028c451efff2045f5d92410bd540" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ef4d7e442ca910c4764bce785146269b30cb5fc4", - "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/0424dff1c58f028c451efff2045f5d92410bd540", + "reference": "0424dff1c58f028c451efff2045f5d92410bd540", "shasum": "" }, "require": { @@ -3249,7 +3244,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.29.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.30.0" }, "funding": [ { @@ -3265,20 +3260,20 @@ "type": "tidelift" } ], - "time": "2024-01-29T20:11:03+00:00" + "time": "2024-05-31T15:07:36+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.29.0", + "version": "v1.30.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec" + "reference": "fd22ab50000ef01661e2a31d850ebaa297f8e03c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9773676c8a1bb1f8d4340a62efe641cf76eda7ec", - "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/fd22ab50000ef01661e2a31d850ebaa297f8e03c", + "reference": "fd22ab50000ef01661e2a31d850ebaa297f8e03c", "shasum": "" }, "require": { @@ -3329,7 +3324,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.29.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.30.0" }, "funding": [ { @@ -3345,20 +3340,20 @@ "type": "tidelift" } ], - "time": "2024-01-29T20:11:03+00:00" + "time": "2024-06-19T12:30:46+00:00" }, { "name": "symfony/polyfill-php73", - "version": "v1.29.0", + "version": "v1.30.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php73.git", - "reference": "21bd091060673a1177ae842c0ef8fe30893114d2" + "reference": "ec444d3f3f6505bb28d11afa41e75faadebc10a1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/21bd091060673a1177ae842c0ef8fe30893114d2", - "reference": "21bd091060673a1177ae842c0ef8fe30893114d2", + "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/ec444d3f3f6505bb28d11afa41e75faadebc10a1", + "reference": "ec444d3f3f6505bb28d11afa41e75faadebc10a1", "shasum": "" }, "require": { @@ -3405,7 +3400,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php73/tree/v1.29.0" + "source": "https://github.com/symfony/polyfill-php73/tree/v1.30.0" }, "funding": [ { @@ -3421,20 +3416,20 @@ "type": "tidelift" } ], - "time": "2024-01-29T20:11:03+00:00" + "time": "2024-05-31T15:07:36+00:00" }, { "name": "symfony/polyfill-php80", - "version": "v1.29.0", + "version": "v1.30.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b" + "reference": "77fa7995ac1b21ab60769b7323d600a991a90433" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/87b68208d5c1188808dd7839ee1e6c8ec3b02f1b", - "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/77fa7995ac1b21ab60769b7323d600a991a90433", + "reference": "77fa7995ac1b21ab60769b7323d600a991a90433", "shasum": "" }, "require": { @@ -3485,7 +3480,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.29.0" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.30.0" }, "funding": [ { @@ -3501,20 +3496,20 @@ "type": "tidelift" } ], - "time": "2024-01-29T20:11:03+00:00" + "time": "2024-05-31T15:07:36+00:00" }, { "name": "symfony/polyfill-php81", - "version": "v1.29.0", + "version": "v1.30.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php81.git", - "reference": "c565ad1e63f30e7477fc40738343c62b40bc672d" + "reference": "3fb075789fb91f9ad9af537c4012d523085bd5af" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/c565ad1e63f30e7477fc40738343c62b40bc672d", - "reference": "c565ad1e63f30e7477fc40738343c62b40bc672d", + "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/3fb075789fb91f9ad9af537c4012d523085bd5af", + "reference": "3fb075789fb91f9ad9af537c4012d523085bd5af", "shasum": "" }, "require": { @@ -3561,7 +3556,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php81/tree/v1.29.0" + "source": "https://github.com/symfony/polyfill-php81/tree/v1.30.0" }, "funding": [ { @@ -3577,7 +3572,7 @@ "type": "tidelift" } ], - "time": "2024-01-29T20:11:03+00:00" + "time": "2024-06-19T12:30:46+00:00" }, { "name": "symfony/process", @@ -4547,16 +4542,16 @@ }, { "name": "myclabs/deep-copy", - "version": "1.11.1", + "version": "1.12.0", "source": { "type": "git", "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c" + "reference": "3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/7284c22080590fb39f2ffa3e9057f10a4ddd0e0c", - "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c", + "reference": "3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c", "shasum": "" }, "require": { @@ -4564,11 +4559,12 @@ }, "conflict": { "doctrine/collections": "<1.6.8", - "doctrine/common": "<2.13.3 || >=3,<3.2.2" + "doctrine/common": "<2.13.3 || >=3 <3.2.2" }, "require-dev": { "doctrine/collections": "^1.6.8", "doctrine/common": "^2.13.3 || ^3.2.2", + "phpspec/prophecy": "^1.10", "phpunit/phpunit": "^7.5.20 || ^8.5.23 || ^9.5.13" }, "type": "library", @@ -4594,7 +4590,7 @@ ], "support": { "issues": "https://github.com/myclabs/DeepCopy/issues", - "source": "https://github.com/myclabs/DeepCopy/tree/1.11.1" + "source": "https://github.com/myclabs/DeepCopy/tree/1.12.0" }, "funding": [ { @@ -4602,7 +4598,7 @@ "type": "tidelift" } ], - "time": "2023-03-08T13:26:56+00:00" + "time": "2024-06-12T14:39:25+00:00" }, { "name": "nikic/php-parser", @@ -6221,16 +6217,16 @@ }, { "name": "squizlabs/php_codesniffer", - "version": "3.10.1", + "version": "3.10.2", "source": { "type": "git", "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git", - "reference": "8f90f7a53ce271935282967f53d0894f8f1ff877" + "reference": "86e5f5dd9a840c46810ebe5ff1885581c42a3017" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/8f90f7a53ce271935282967f53d0894f8f1ff877", - "reference": "8f90f7a53ce271935282967f53d0894f8f1ff877", + "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/86e5f5dd9a840c46810ebe5ff1885581c42a3017", + "reference": "86e5f5dd9a840c46810ebe5ff1885581c42a3017", "shasum": "" }, "require": { @@ -6297,7 +6293,7 @@ "type": "open_collective" } ], - "time": "2024-05-22T21:24:41+00:00" + "time": "2024-07-21T23:26:44+00:00" }, { "name": "theseer/tokenizer", From 23db4c8fc6975f8aef52e2d2e13958c62bdf4cba Mon Sep 17 00:00:00 2001 From: Riddhesh Sanghvi Date: Wed, 14 Aug 2024 19:01:03 +0530 Subject: [PATCH 9/9] Bump to version v4.7.3 Signed-off-by: Riddhesh Sanghvi --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index af9764a59..87b18a567 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.7.2 +4.7.3