From 6bca9f836836f4bea2112cd6635a384e862b4db2 Mon Sep 17 00:00:00 2001 From: Taufan Aditya Date: Fri, 25 May 2012 01:55:36 +0700 Subject: get vfsStream via composer if its PEAR package not exists --- composer.json | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 composer.json (limited to 'composer.json') diff --git a/composer.json b/composer.json new file mode 100644 index 000000000..fa6dc02e4 --- /dev/null +++ b/composer.json @@ -0,0 +1,5 @@ +{ + "require": { + "mikey179/vfsStream": "*" + } +} \ No newline at end of file -- cgit v1.2.3-24-g4f1b From 3104e3f23724b68a396cbaf2f2b1d9677b935126 Mon Sep 17 00:00:00 2001 From: Alex Bilbie Date: Thu, 30 Aug 2012 00:21:19 +0100 Subject: Added PHPUnit to the development requirements of composer.json --- composer.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'composer.json') diff --git a/composer.json b/composer.json index fa6dc02e4..dc098acc3 100644 --- a/composer.json +++ b/composer.json @@ -1,5 +1,8 @@ { "require": { "mikey179/vfsStream": "*" - } + }, + "require-dev": { + "EHER/PHPUnit": "*" + } } \ No newline at end of file -- cgit v1.2.3-24-g4f1b From 390f401102cef992a682b487c906961ae4bdcafa Mon Sep 17 00:00:00 2001 From: Alex Bilbie Date: Tue, 16 Oct 2012 18:36:48 +0100 Subject: Updated composer.json to use official PHPUnit package Signed-off-by: Alex Bilbie --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'composer.json') diff --git a/composer.json b/composer.json index dc098acc3..7d60020c3 100644 --- a/composer.json +++ b/composer.json @@ -3,6 +3,6 @@ "mikey179/vfsStream": "*" }, "require-dev": { - "EHER/PHPUnit": "*" + "phpunit/phpunit": "*" } } \ No newline at end of file -- cgit v1.2.3-24-g4f1b From 687742109d5e8f06eadb1607501e5a94163aa902 Mon Sep 17 00:00:00 2001 From: David Barratt Date: Sat, 16 Feb 2013 02:01:47 -0500 Subject: Add the Project Name to the Composer File. --- composer.json | 1 + 1 file changed, 1 insertion(+) (limited to 'composer.json') diff --git a/composer.json b/composer.json index 7d60020c3..141ce2bfb 100644 --- a/composer.json +++ b/composer.json @@ -1,4 +1,5 @@ { + "name" : "EllisLab/CodeIgniter", "require": { "mikey179/vfsStream": "*" }, -- cgit v1.2.3-24-g4f1b From d20ed1dbc3b2e3f3b1dd60325f95fff745bfebbb Mon Sep 17 00:00:00 2001 From: David Barratt Date: Sat, 16 Feb 2013 02:03:20 -0500 Subject: Lowercase the project name as uppercase letters are not allowed. --- composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'composer.json') diff --git a/composer.json b/composer.json index 141ce2bfb..b48f8c118 100644 --- a/composer.json +++ b/composer.json @@ -1,9 +1,9 @@ { - "name" : "EllisLab/CodeIgniter", + "name" : "ellislab/codeigniter", "require": { "mikey179/vfsStream": "*" }, "require-dev": { - "phpunit/phpunit": "*" - } + "phpunit/phpunit": "*" + } } \ No newline at end of file -- cgit v1.2.3-24-g4f1b From 0fc08356b982807750464a7695c8fba47599d32e Mon Sep 17 00:00:00 2001 From: David Barratt Date: Sat, 16 Feb 2013 02:52:00 -0500 Subject: Require at least PHP 5.1.6. --- composer.json | 1 + 1 file changed, 1 insertion(+) (limited to 'composer.json') diff --git a/composer.json b/composer.json index b48f8c118..bcab60f23 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,7 @@ { "name" : "ellislab/codeigniter", "require": { + "php": ">=5.1.6", "mikey179/vfsStream": "*" }, "require-dev": { -- cgit v1.2.3-24-g4f1b From 7a8db6506dfad2a8dbb7b9ba09133c8c0152d6e8 Mon Sep 17 00:00:00 2001 From: David Barratt Date: Sat, 16 Feb 2013 10:51:52 -0500 Subject: Update the required version of PHP to 5.2.4 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'composer.json') diff --git a/composer.json b/composer.json index bcab60f23..c13ac5aca 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,7 @@ { "name" : "ellislab/codeigniter", "require": { - "php": ">=5.1.6", + "php": ">=5.2.4", "mikey179/vfsStream": "*" }, "require-dev": { -- cgit v1.2.3-24-g4f1b From e8f15935a4f576d219708f495c19f234ac5a238a Mon Sep 17 00:00:00 2001 From: David Barratt Date: Sun, 17 Feb 2013 23:20:54 -0500 Subject: Move mikey179/vfsStream to only be required on dev --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'composer.json') diff --git a/composer.json b/composer.json index c13ac5aca..bf3b3d22b 100644 --- a/composer.json +++ b/composer.json @@ -2,9 +2,9 @@ "name" : "ellislab/codeigniter", "require": { "php": ">=5.2.4", - "mikey179/vfsStream": "*" }, "require-dev": { + "mikey179/vfsStream": "*" "phpunit/phpunit": "*" } } \ No newline at end of file -- cgit v1.2.3-24-g4f1b From cbe553072812de5cbfbdf4603d18d8b1cad4e453 Mon Sep 17 00:00:00 2001 From: David Barratt Date: Sun, 17 Feb 2013 23:27:16 -0500 Subject: Fix a JSON validation error --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'composer.json') diff --git a/composer.json b/composer.json index bf3b3d22b..54f305e89 100644 --- a/composer.json +++ b/composer.json @@ -1,10 +1,10 @@ { "name" : "ellislab/codeigniter", "require": { - "php": ">=5.2.4", + "php": ">=5.2.4" }, "require-dev": { - "mikey179/vfsStream": "*" + "mikey179/vfsStream": "*", "phpunit/phpunit": "*" } } \ No newline at end of file -- cgit v1.2.3-24-g4f1b From 1396a958a5b96cc6c617ae725034fa58542acd25 Mon Sep 17 00:00:00 2001 From: David Barratt Date: Mon, 18 Feb 2013 17:23:44 -0500 Subject: Attempt to get travis to work by adding php-invoker --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'composer.json') diff --git a/composer.json b/composer.json index 54f305e89..ec34372ac 100644 --- a/composer.json +++ b/composer.json @@ -5,6 +5,7 @@ }, "require-dev": { "mikey179/vfsStream": "*", - "phpunit/phpunit": "*" + "phpunit/phpunit": "*", + "phpunit/php-invoker": ">=1.1.0,<1.2.0" } } \ No newline at end of file -- cgit v1.2.3-24-g4f1b From bcc411efa6027f409eaf59d1d32422013e9c20da Mon Sep 17 00:00:00 2001 From: David Barratt Date: Mon, 18 Feb 2013 17:32:13 -0500 Subject: Revert "Attempt to get travis to work by adding php-invoker" This reverts commit 1396a958a5b96cc6c617ae725034fa58542acd25. --- composer.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'composer.json') diff --git a/composer.json b/composer.json index ec34372ac..54f305e89 100644 --- a/composer.json +++ b/composer.json @@ -5,7 +5,6 @@ }, "require-dev": { "mikey179/vfsStream": "*", - "phpunit/phpunit": "*", - "phpunit/php-invoker": ">=1.1.0,<1.2.0" + "phpunit/phpunit": "*" } } \ No newline at end of file -- cgit v1.2.3-24-g4f1b From b4a23d2af5309d5b264f3f12c272e93667b87aca Mon Sep 17 00:00:00 2001 From: David Barratt Date: Mon, 18 Feb 2013 17:46:47 -0500 Subject: See how many errors are produced when no dependencies are included --- composer.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'composer.json') diff --git a/composer.json b/composer.json index 54f305e89..48aea9ff9 100644 --- a/composer.json +++ b/composer.json @@ -2,9 +2,5 @@ "name" : "ellislab/codeigniter", "require": { "php": ">=5.2.4" - }, - "require-dev": { - "mikey179/vfsStream": "*", - "phpunit/phpunit": "*" - } + } } \ No newline at end of file -- cgit v1.2.3-24-g4f1b From b2834114746585b60a490992a02c1b136363e791 Mon Sep 17 00:00:00 2001 From: David Barratt Date: Mon, 18 Feb 2013 17:52:14 -0500 Subject: vfsStream is required for travis --- composer.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'composer.json') diff --git a/composer.json b/composer.json index 48aea9ff9..e21aaed2e 100644 --- a/composer.json +++ b/composer.json @@ -2,5 +2,8 @@ "name" : "ellislab/codeigniter", "require": { "php": ">=5.2.4" - } + }, + "require-dev": { + "mikey179/vfsStream": "*" + } } \ No newline at end of file -- cgit v1.2.3-24-g4f1b From eb5991ccd0686d15615bff3a730a641889063943 Mon Sep 17 00:00:00 2001 From: David Barratt Date: Mon, 18 Feb 2013 18:04:45 -0500 Subject: Revert all changes to see if travis just doesn't like me. --- composer.json | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'composer.json') diff --git a/composer.json b/composer.json index e21aaed2e..7d60020c3 100644 --- a/composer.json +++ b/composer.json @@ -1,9 +1,8 @@ { - "name" : "ellislab/codeigniter", "require": { - "php": ">=5.2.4" + "mikey179/vfsStream": "*" }, "require-dev": { - "mikey179/vfsStream": "*" - } + "phpunit/phpunit": "*" + } } \ No newline at end of file -- cgit v1.2.3-24-g4f1b From dc5c5a371aeab5af6440c0c39a4501405636b826 Mon Sep 17 00:00:00 2001 From: David Barratt Date: Tue, 19 Feb 2013 07:18:30 -0500 Subject: Revert "Revert all changes to see if travis just doesn't like me." This reverts commit eb5991ccd0686d15615bff3a730a641889063943. --- composer.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'composer.json') diff --git a/composer.json b/composer.json index 7d60020c3..e21aaed2e 100644 --- a/composer.json +++ b/composer.json @@ -1,8 +1,9 @@ { + "name" : "ellislab/codeigniter", "require": { - "mikey179/vfsStream": "*" + "php": ">=5.2.4" }, "require-dev": { - "phpunit/phpunit": "*" - } + "mikey179/vfsStream": "*" + } } \ No newline at end of file -- cgit v1.2.3-24-g4f1b From 14707e3a38aa0c8f0c20c1fff3a1008d34371ee7 Mon Sep 17 00:00:00 2001 From: Darren Benney Date: Sat, 30 Mar 2013 17:26:23 +0000 Subject: Added description to composer.json When executing "composer validate", an error is generated because there is no description. Also removed a couple of tabs and replaced them with spaces to neaten it up slightly. --- composer.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'composer.json') diff --git a/composer.json b/composer.json index e21aaed2e..44c54b481 100644 --- a/composer.json +++ b/composer.json @@ -1,9 +1,10 @@ { + "description" : "Dependencies for CodeIgniter's testing environment", "name" : "ellislab/codeigniter", "require": { "php": ">=5.2.4" }, "require-dev": { - "mikey179/vfsStream": "*" - } -} \ No newline at end of file + "mikey179/vfsStream": "*" + } +} -- cgit v1.2.3-24-g4f1b From 714b11ac334bec39cf3f2aea5093e0f61c02f983 Mon Sep 17 00:00:00 2001 From: Darren Benney Date: Sat, 30 Mar 2013 21:04:11 +0000 Subject: Changed spaces to tabs for consistency. --- composer.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'composer.json') diff --git a/composer.json b/composer.json index 44c54b481..ccc239400 100644 --- a/composer.json +++ b/composer.json @@ -1,10 +1,10 @@ { - "description" : "Dependencies for CodeIgniter's testing environment", - "name" : "ellislab/codeigniter", - "require": { - "php": ">=5.2.4" - }, - "require-dev": { - "mikey179/vfsStream": "*" - } + "description" : "Dependencies for CodeIgniter's testing environment", + "name" : "ellislab/codeigniter", + "require": { + "php": ">=5.2.4" + }, + "require-dev": { + "mikey179/vfsStream": "*" + } } -- cgit v1.2.3-24-g4f1b From 492a3e332f4fb4da0beb28a12ec1ea234b875750 Mon Sep 17 00:00:00 2001 From: Darren Benney Date: Mon, 1 Apr 2013 10:22:39 +0100 Subject: Removed newline at EOF --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'composer.json') diff --git a/composer.json b/composer.json index ccc239400..29715763f 100644 --- a/composer.json +++ b/composer.json @@ -7,4 +7,4 @@ "require-dev": { "mikey179/vfsStream": "*" } -} +} \ No newline at end of file -- cgit v1.2.3-24-g4f1b From c56ab9b4203ca07502cf25ac76e31f816ef75d96 Mon Sep 17 00:00:00 2001 From: Eric Roberts Date: Fri, 12 Jul 2013 21:22:02 -0500 Subject: PHPUnit & Travis failures due to new version of vfsStream. --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'composer.json') diff --git a/composer.json b/composer.json index 29715763f..0f98fe7a0 100644 --- a/composer.json +++ b/composer.json @@ -5,6 +5,6 @@ "php": ">=5.2.4" }, "require-dev": { - "mikey179/vfsStream": "*" + "mikey179/vfsStream": "1.1.*" } } \ No newline at end of file -- cgit v1.2.3-24-g4f1b From b621336af82ea11a62c33cc80eb4e08b345c24a8 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Tue, 28 Oct 2014 01:05:40 +0200 Subject: [ci skip] Update composer.json --- composer.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'composer.json') diff --git a/composer.json b/composer.json index 0f98fe7a0..4ff60c57e 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,7 @@ { - "description" : "Dependencies for CodeIgniter's testing environment", - "name" : "ellislab/codeigniter", + "description" : "The CodeIgniter framework", + "name" : "codeigniter/framework", + "license": "MIT", "require": { "php": ">=5.2.4" }, -- cgit v1.2.3-24-g4f1b From 326141a75814bac389acee26fe59eb1c4b0e68e9 Mon Sep 17 00:00:00 2001 From: Lonnie Ezell Date: Sun, 3 May 2015 23:46:12 -0500 Subject: Fleshing out the composer.json file with more basic info. --- composer.json | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'composer.json') diff --git a/composer.json b/composer.json index 4ff60c57e..c5f2f5aca 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,17 @@ { "description" : "The CodeIgniter framework", "name" : "codeigniter/framework", + "description": "CodeIgniter is a powerful PHP framework with a very small footprint, built for developers who need a simple and elegant toolkit to create full-featured web applications.", + "type": "project", + "homepage": "http://codeigniter.com", "license": "MIT", + "support": { + "issues": "https://github.com/bcit-ci/CodeIgniter/issues", + "forum": "http://forum.codeigniter.com/", + "wiki": "https://github.com/bcit-ci/CodeIgniter/wiki", + "irc": "http://www.codeigniter.com/irc", + "source": "https://github.com/bcit-ci/CodeIgniter" + }, "require": { "php": ">=5.2.4" }, -- cgit v1.2.3-24-g4f1b From 52fc5b0da856022261539854311533adb770873f Mon Sep 17 00:00:00 2001 From: Lonnie Ezell Date: Mon, 4 May 2015 07:47:15 -0500 Subject: Converting whitespace to tabs and removing issues link --- composer.json | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) (limited to 'composer.json') diff --git a/composer.json b/composer.json index c5f2f5aca..4fee20441 100644 --- a/composer.json +++ b/composer.json @@ -1,17 +1,16 @@ { - "description" : "The CodeIgniter framework", - "name" : "codeigniter/framework", - "description": "CodeIgniter is a powerful PHP framework with a very small footprint, built for developers who need a simple and elegant toolkit to create full-featured web applications.", - "type": "project", - "homepage": "http://codeigniter.com", + "description": "The CodeIgniter framework", + "name": "codeigniter/framework", + "description": "CodeIgniter is a powerful PHP framework with a very small footprint, built for developers who need a simple and elegant toolkit to create full-featured web applications.", + "type": "project", + "homepage": "http://codeigniter.com", "license": "MIT", - "support": { - "issues": "https://github.com/bcit-ci/CodeIgniter/issues", - "forum": "http://forum.codeigniter.com/", - "wiki": "https://github.com/bcit-ci/CodeIgniter/wiki", - "irc": "http://www.codeigniter.com/irc", - "source": "https://github.com/bcit-ci/CodeIgniter" - }, + "support": { + "forum": "http://forum.codeigniter.com/", + "wiki": "https://github.com/bcit-ci/CodeIgniter/wiki", + "irc": "http://www.codeigniter.com/irc", + "source": "https://github.com/bcit-ci/CodeIgniter" + }, "require": { "php": ">=5.2.4" }, -- cgit v1.2.3-24-g4f1b From ca2d5f9e4785395c02133a12fc8d436f697ccfc2 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Mon, 4 May 2015 16:03:53 +0300 Subject: [ci skip] Fix IRC link in composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'composer.json') diff --git a/composer.json b/composer.json index 4fee20441..76bd21787 100644 --- a/composer.json +++ b/composer.json @@ -8,7 +8,7 @@ "support": { "forum": "http://forum.codeigniter.com/", "wiki": "https://github.com/bcit-ci/CodeIgniter/wiki", - "irc": "http://www.codeigniter.com/irc", + "irc": "irc://irc.freenode.net/codeigniter", "source": "https://github.com/bcit-ci/CodeIgniter" }, "require": { -- cgit v1.2.3-24-g4f1b From 7cf0cc1ffe3fc1722ccf00ddf9f4c18337b4d611 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Tue, 5 May 2015 14:29:04 +0300 Subject: [ci skip] Remove double description from composer.json --- composer.json | 1 - 1 file changed, 1 deletion(-) (limited to 'composer.json') diff --git a/composer.json b/composer.json index 76bd21787..0653a7885 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,6 @@ { "description": "The CodeIgniter framework", "name": "codeigniter/framework", - "description": "CodeIgniter is a powerful PHP framework with a very small footprint, built for developers who need a simple and elegant toolkit to create full-featured web applications.", "type": "project", "homepage": "http://codeigniter.com", "license": "MIT", -- cgit v1.2.3-24-g4f1b From bd202c91b0e9cf0a8c93bcaa71df9574f5909346 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Mon, 11 Jan 2016 12:50:18 +0200 Subject: [ci skip] Update codeigniter.com links to https --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'composer.json') diff --git a/composer.json b/composer.json index 0653a7885..4a9e8748e 100644 --- a/composer.json +++ b/composer.json @@ -2,7 +2,7 @@ "description": "The CodeIgniter framework", "name": "codeigniter/framework", "type": "project", - "homepage": "http://codeigniter.com", + "homepage": "https://codeigniter.com", "license": "MIT", "support": { "forum": "http://forum.codeigniter.com/", -- cgit v1.2.3-24-g4f1b From 1b7840b58c0705cc8a78c164940a114fa0012fae Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Mon, 7 Mar 2016 13:01:57 +0200 Subject: [ci skip] Add random_compat as a suggested package in composer.json --- composer.json | 3 +++ 1 file changed, 3 insertions(+) (limited to 'composer.json') diff --git a/composer.json b/composer.json index 4a9e8748e..64d1be155 100644 --- a/composer.json +++ b/composer.json @@ -13,6 +13,9 @@ "require": { "php": ">=5.2.4" }, + "suggest": { + "paragonie/random_compat": "Provides better randomness in PHP 5.x" + }, "require-dev": { "mikey179/vfsStream": "1.1.*" } -- cgit v1.2.3-24-g4f1b From f565212c5aa07a8016394a3bc66874be83c73d4d Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Thu, 19 Jan 2017 15:17:00 +0200 Subject: Fix byte-safety issues & actually test for them --- composer.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'composer.json') diff --git a/composer.json b/composer.json index 64d1be155..0a898d2c1 100644 --- a/composer.json +++ b/composer.json @@ -17,6 +17,7 @@ "paragonie/random_compat": "Provides better randomness in PHP 5.x" }, "require-dev": { - "mikey179/vfsStream": "1.1.*" + "mikey179/vfsStream": "1.1.*", + "phpunit/phpunit": "4.* || 5.*" } -} \ No newline at end of file +} -- cgit v1.2.3-24-g4f1b From 2459285b91d6fc4f5099f9f597529cce1059cb33 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Mon, 19 Jun 2017 11:29:39 +0300 Subject: [ci skip] Prepare 3.1.5 release --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'composer.json') diff --git a/composer.json b/composer.json index 0a898d2c1..c40d549c9 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,7 @@ "source": "https://github.com/bcit-ci/CodeIgniter" }, "require": { - "php": ">=5.2.4" + "php": ">=5.3.7" }, "suggest": { "paragonie/random_compat": "Provides better randomness in PHP 5.x" -- cgit v1.2.3-24-g4f1b