1
0
Fork 0
Commit Graph

135 Commits (7f9638f65a404e4ad3b69eda320575649377f758)

Author SHA1 Message Date
Jordi Boggiano c8aea719b1 CS fixes 2017-12-18 16:02:48 +01:00
Gabriel Caruso afc9a7643e Use PHPUnit\Framework\TestCase instead of PHPUnit_Framework_TestCase 2017-11-30 13:44:43 -02:00
Deamon 3d753b117b add test on remove mainkey at end of file 2017-09-11 16:07:13 +02:00
Sven Münnich d51ef83a43 Fix case insensitivity of ‘require’ command
When currently executing the `require` command for a package that is already listed in `require(-dev)`, one must use the exact same, case matching package name as written in `composer.json`. That is, if one changes the case of a character in the package name, the `require` command will add a new entry to `require(-dev)`, instead of updating the existing one.

This commit fixes the described behaviour to make it consistent with other commands like `update` that are already case insensitive.
2017-07-03 12:11:24 +02:00
Remi Collet 95d82f6fde fix test for json-schema 5.2 2017-05-22 08:01:51 +02:00
Jordi Boggiano 122e422682 CS fixes 2017-03-08 15:16:44 +01:00
Christophe Coevoet 1cb0ec7911 Resolve references in ComposerSchemaTest 2017-01-03 11:57:35 +01:00
Jordi Boggiano 43903a3979 Merge branch '1.2' 2016-11-06 17:38:53 +01:00
Christophe Coevoet 1882f9a502 Enhance the json schema with validation for map objects 2016-11-03 13:19:20 +01:00
Jordi Boggiano e38ebefc7e Update packagist default repo to be packagist.org 2016-11-03 11:00:40 +01:00
Jordi Boggiano d1867d5859 Merge branch '1.2' 2016-10-10 18:21:22 +02:00
Jordi Boggiano 5ee22f25ba Rework JSON matching to use a properly recursive pattern, fixes #5771 2016-10-10 18:20:53 +02:00
Jordi Boggiano 092dec9596 Add failing test for #5771 2016-10-10 18:12:24 +02:00
Jordi Boggiano 20ee689bb4 Upgrade json-schema to allow v3 and upgrade other deps 2016-09-14 18:06:37 +02:00
Jordi Boggiano 135783299a Add support for editing top level properties and extra values, replaces #2415, fixes #1411, fixes #2384 2016-04-27 14:04:01 +01:00
Daniel Iancu 3bdb0ee5fd Fix addMainKey method of JsonManipulator with content having $n
This will store correctly passwords having a dolloar sign followed by a digit in the auth.json file.
If the content variable has "$n" (where n consists of digits) it will match as a replacement reference for preg_replace and thus it will get stripped because there's no such parenthesized pattern.
2016-04-20 22:34:39 +03:00
Jordi Boggiano edebbef98a Add test and fix for very large repos, moar possessive quantifiers, fixes #5104 2016-03-24 16:04:52 +00:00
Jordi Boggiano 48420a2411 Update deps and bump json-schema requirement, fixes #4756 2016-01-09 16:52:06 +00:00
Thiago Carvalho 320533bcf9 Fixes #4610 2015-11-21 08:58:52 +01:00
Remi Collet a6c6537529 skip no more needed with jsonc 1.3.9 2015-11-04 09:11:01 +01:00
Jordi Boggiano ce08582671 Fix CS 2015-09-28 10:53:24 +01:00
Remi Collet 9b9cbfe111 fix for changes in justinrainbow/json-schema 1.4.4 2015-07-16 12:03:35 +02:00
Remi Collet c014e0882f ignore this test with 'jsonc' 2015-07-16 12:03:35 +02:00
Jordi Boggiano 27aac31970 Fix tests for autocrlf=true checkouts, fixes #4049 2015-05-28 14:43:52 +01:00
Possum 29ca21f30e PHP version checks tweaking 2015-05-05 20:18:24 +02:00
Jordi Boggiano 21e92b869e Merge pull request #4000 from SpacePossum/json_testing
On Json tests failures show more test failure details
2015-05-05 17:41:44 +01:00
Possum d7f7418243 some more test failure details 2015-05-05 18:13:16 +02:00
Possum 2e99b9fdf5 Use https where possible 2015-05-04 19:37:57 +02:00
Jordi Boggiano ab02867015 Use natural sort to sort packages, refs #3872 2015-05-01 16:16:02 +01:00
Jordi Boggiano 081e26f4d7 Merge remote-tracking branch 'localheinz/feature/sort-packages' 2015-05-01 16:08:57 +01:00
Jordi Boggiano 00ca2a91a3 Fix typo 2015-04-30 00:08:45 +01:00
Jordi Boggiano a5dfaafa02 Add a fixture for the schema validation 2015-04-29 23:45:30 +01:00
Jordi Boggiano fa398e14c7 Fix indent detection in json files when an empty line starts the object 2015-04-29 22:42:57 +01:00
Jordi Boggiano 32a479a1e7 Fix subkey manipulation when the main key does not exist yet 2015-04-29 22:42:41 +01:00
Andreas Möller 32538a21a2 Enhancement: Sort packages by importance, then alphabetically 2015-03-25 14:10:20 +01:00
Rob Bast d02eb8760b strict check, testcase(s) 2015-02-10 12:55:49 +01:00
Jordi Boggiano 6c971c3028 Fix regex matching and add more tests for addSubNode, refs #3721, fixes #3716 2015-02-09 19:11:32 +00:00
Rob Bast fb54429941 solve edge case for `composer remove vendor/pkg` 2015-02-09 17:21:20 +01:00
Jordi Boggiano bef89604e2 Fix parsing of strings, fixes #3543 2014-12-13 14:31:58 +00:00
Andreas Möller 6ddd8d4ec7 Enhancement: Add sort-packages option which allows sorting of packages 2014-12-13 00:24:14 +01:00
Jordi Boggiano 94926218e8 CS fixes 2014-10-17 18:57:27 +01:00
Jordi Boggiano 109f4ffd5e Normalize json across all php versions, fixes #3226 2014-10-04 17:02:42 +01:00
Jordi Boggiano ed54e8346d Fix json test, fixes #3326 2014-10-04 12:33:28 +01:00
Jordi Boggiano 55a6a1c3d4 Add support for nested arrays in the json manipulator, fixes #3296 2014-09-24 18:32:10 +01:00
Jordi Boggiano 8881cec174 Simplify version ranges (hopefully includes hhvm), refs #3049 2014-06-29 12:27:27 +02:00
Jordi Boggiano 3874a11238 Update json test 2014-06-22 11:01:05 +02:00
Jordi Boggiano ac497feaba CS fixes 2014-06-10 16:13:12 +02:00
Jordi Boggiano 7131607ad1 Fix regression in handling github-oauth settings in auth.json 2014-05-27 16:26:24 +02:00
Jordi Boggiano 4392be4d29 Fix some more inconsistencies in json manipulation 2014-04-10 16:11:43 +02:00
Jordi Boggiano d742ffca4f Fix removal of missing keys 2014-04-10 15:55:05 +02:00
Jordi Boggiano 604a65cc31 Fix indenting, refs #2788 2014-03-06 10:26:16 +01:00
Sylvain Filteau 92e283973f Skip test requiring mbstring when it's not installed 2014-03-05 20:30:09 -05:00
Sandy Pleyte 3a2815b778 Added extra unit test from the example in the ticket. 2014-02-19 14:17:23 +01:00
Sandy Pleyte f92f2f45a9 Fix for #2613, when using php < 5.4 there was an unnecessary backslash before each utf-8 char. The problem was that the regexp matched all utf-8 encoded chars (included the ones that where escaped). The new regexp uses the lookbehind feature to check if the backslash isn't prefixed with an other backslash. 2014-02-18 09:01:12 +01:00
Sandy Pleyte 7a902ed96d Fix for #2613, when using php < 5.4 there was an unnecessary backslash before each utf-8 char. The problem was that the regexp matched all utf-8 encoded chars (included the ones that where escaped). The new regexp uses the lookbehind feature to check if the backslash isn't prefixed with an other backslash. 2014-02-17 13:54:35 +01:00
Zbigniew 94635c0d14 [tests] Unit tests for JsonValidationException class 2014-01-30 17:39:13 +00:00
Jordi Boggiano 99f5b5a238 Fix backtracking issue in json manipulations, fixes #2583 2014-01-12 21:13:00 +01:00
Jordi Boggiano 3b48a1fea6 Fix JsonManipulator handling of package links, fixes #1465 2013-05-12 22:54:53 +02:00
Jordi Boggiano 3bd6af690d Allow JsonManipulator::addMainKey to update top level keys as well 2013-05-12 13:24:18 +02:00
Jordi Boggiano 3d953384fa Fix indenting detection in JsonManipulator, fixes #1788 2013-04-11 10:34:26 +02:00
Jordi Boggiano b4d691e46d Add test for escape sequences 2013-02-18 22:13:54 +01:00
Jordi Boggiano e348642aa7 Fix json manipulator handling of escaped backslashes, fixes #1588 2013-02-18 17:27:43 +01:00
Jordi Boggiano a7c950cddd Add support for github-oauth in config command 2013-01-16 16:19:22 +01:00
Jordi Boggiano dea4bdf8f0 Expand {} into a new line before manipulating json, fixes #1481 2013-01-13 17:06:35 +01:00
Jordi Boggiano 24963fb4c8 Fix handling of arrays in json manipulator 2012-11-13 12:49:23 +01:00
Jordi Boggiano 5cb9a6ead7 Write in the json directly without reformatting the whole file - skip validation since that is not really the job of the config command 2012-10-07 19:18:22 +02:00
Jordi Boggiano 521bbe6556 CS fixes 2012-08-18 16:22:15 +02:00
Jordi Boggiano db16f68fbf Tweak exception messages 2012-07-03 14:21:10 +02:00
Robert Schönthal e96e06946f fixed json file tests 2012-07-03 12:37:58 +02:00
Robert Schönthal c517ac6404 fixed issue #347 added file to json validation exception 2012-07-03 12:37:58 +02:00
Jordi Boggiano f5e0918104 Add JsonManipulator class for doing raw manipulation of json strings 2012-05-26 14:44:24 +02:00
Jordi Boggiano a30e6109bf Fix 5.4.0 interop in formatting of empty array/objects 2012-04-29 21:04:18 +02:00
Martin Hasoň 947d429c61 Removed definition of global constants reserved for PHP >=5.4 and fixed tests 2012-03-09 09:31:51 +01:00
Jordi Boggiano bd54e43d37 Rework JsonFile API slightly, avoid tokenizing in php if the syntax is valid 2012-03-05 22:01:47 +01:00
digitalkaoz 6929c42848 added schema/syntax validation for composer.json 2012-02-23 21:54:49 +01:00
Volker Dusch 9ede082371 Skip tests if mbstring is not installed 2012-02-18 11:36:11 +01:00
Martin Hasoň e621495c4d Added support for JSON_UNESCAPED_SLASHES 2012-02-17 10:06:59 +01:00
Martin Hasoň ff0f833b3e Added support for JSON_UNESCAPED_UNICODE and fixed parsing string 2012-02-15 12:00:04 +01:00
Martin Hasoň 76a2be5ae0 Fixed detection of missing comma and added detection of missing colon in json 2012-01-24 15:10:55 +01:00
Jakub Zalas c680ec7e51 Fixed json encoding when quoted value contained trailing backslash.
Condition checking if current character is inside a quoted string did not consider the case when backslash before quote is escaped with another backslash.
2012-01-19 00:01:56 +00:00
Justin Rainbow 447230d77a Extracting JsonFile additions for prettifying JSON 2012-01-16 16:42:36 -07:00
Jordi Boggiano b7f6cf69ab Add tests and fixes some issues 2011-11-05 23:54:05 +01:00
Jordi Boggiano 066a0db752 Add detection for unescaped backslashes 2011-11-01 16:02:56 +01:00
Jordi Boggiano f5aa3e6c79 Add detection for extra commas in arrays 2011-11-01 14:13:22 +01:00
Jordi Boggiano c129d570e8 Add more json validation rules 2011-10-31 15:01:46 +01:00