1
0
Fork 0
Commit Graph

4469 Commits (f9f2bbac59ed1de898ccf2533e3e290bd80afc26)

Author SHA1 Message Date
Jordi Boggiano 016a016455 Merge remote-tracking branch 'lcobucci/master'
Conflicts:
	src/Composer/Downloader/FileDownloader.php
2014-05-07 18:02:46 +02:00
Jonas Stendahl 868121c7b2 Updated Satis install command. 2014-05-07 17:45:37 +02:00
Jordi Boggiano 7ad5e1a7fa Merge pull request #2977 from renatbilalov/master
Corrected description of the option --optimize (-o)
2014-05-07 11:00:46 +02:00
renatbilalov ee142688e1 Corrected description of the option --optimize (-o) 2014-05-07 14:55:42 +06:00
Jordi Boggiano 3677c1ea69 Merge pull request #2950 from jakoch/patch-4
reduce commit history of git checkout
2014-05-03 09:46:50 +02:00
jakoch 2a3159ec57 reduce commit history of git checkout (git depth 5) 2014-05-02 18:14:04 +02:00
jakoch a0e5ead9b0 removed unused variables $baseDir and $vendorDir from "autoloader_real.php" generated by AutoloadGenerator. adjusted tests accordingly. 2014-05-02 17:42:31 +02:00
Jordi Boggiano e87bc894da Merge pull request #2952 from jeromemacias/config_validator_array_loader_flags
Add --no-check-all option to composer validate command
2014-05-01 17:40:28 +02:00
Jérôme Macias 4f417e3985 Add --no-check-all option to composer validate command 2014-04-30 16:28:04 +02:00
Jordi Boggiano 6ffd34db90 Merge pull request #2948 from jakoch/patch-2
disable these xdebug settings only, if xdebug is loaded
2014-04-30 13:03:37 +02:00
jakoch 01968efa6f renamed listFiles() to getFolderContent(). fixed comment: the method doesn't return a "list of files in a directory, including dotfiles", it returns a "list of files and folders, excluding dotfiles". switched from !is_file() to is_dir() check. 2014-04-30 11:52:31 +02:00
jakoch 8fd82784b2 disable these xdebug settings only, if xdebug is loaded 2014-04-30 11:29:52 +02:00
Jordi Boggiano 05d9912f97 Ignore classes in ClassMapGenerator 2014-04-29 14:36:19 +02:00
Jordi Boggiano 29c39cc266 Merge pull request #2945 from fabpot/classmap-hotfix
fixed class map generator when using a heredoc with spaces
2014-04-28 17:57:52 +02:00
Fabien Potencier 12421dd6b7 fixed class map generator when using a heredoc with spaces 2014-04-28 15:21:22 +02:00
Jordi Boggiano 0f9bda3e37 Merge pull request #2942 from havvg/patch-1
fix autoload-dev example for PSR-4
2014-04-27 15:32:58 +02:00
Toni Uebernickel 2c6195785d fix autoload-dev example for PSR-4
The example leads to the following error.

```
  [InvalidArgumentException]
  A non-empty PSR-4 prefix must end with a namespace separator.
```
2014-04-27 12:29:35 +02:00
Jordi Boggiano eebffacd9f Use pagination to get tags/branches from the github API 2014-04-24 16:41:42 +02:00
Jordi Boggiano 009fcb4262 Fix arg signature 2014-04-20 19:34:54 +02:00
Jordi Boggiano cfed93287c Remove fenced block 2014-04-16 17:23:42 +02:00
Jordi Boggiano 3251f9f1aa Only check phar validity if phar.readonly is false 2014-04-16 10:24:13 +02:00
Jordi Boggiano ab4ecb9471 Merge pull request #2918 from Evan-R/patch-1
add note for alternate download method in case curl fails
2014-04-16 09:00:06 +02:00
Jordi Boggiano 7b487360e3 Merge pull request #2921 from schmkr/svn-driver-patch
Updating SvnDriver trunk revision check
2014-04-16 08:27:25 +02:00
schmkr 8dd6b052ce Updating SvnDriver trunk revision check
Not checking revision of composer.json, but from its parent directory.

See composer/composer#2849
2014-04-15 23:56:45 +02:00
Evan-R ee6a843b8e add note for alternate download method in case curl fails 2014-04-15 04:58:44 -06:00
Jordi Boggiano 14f35e812c Merge pull request #2912 from ckwalsh/master
Support generating class map for XHP classes
2014-04-14 14:11:15 +02:00
Jordi Boggiano 1347d5306a Make sure a good timezone is set, fixes #2899 2014-04-14 13:55:17 +02:00
Jordi Boggiano 49d4054e51 Handle files with no php at all, fixes #2910 2014-04-14 12:47:47 +02:00
Cullen Walsh 57d9e9852d Support generating class map for XHP classes 2014-04-14 00:21:53 -04:00
Jordi Boggiano f3c112e9e0 Split non-interactive and bad credential cases 2014-04-11 15:01:20 +02:00
Jordi Boggiano b437c1cc05 Support github auth directly in the RemoteFilesystem class 2014-04-11 14:29:17 +02:00
Jordi Boggiano 68e910d92a Merge pull request #2897 from jaypatel512/patch-1
Removing dist reference info from Artifact Repository
2014-04-11 13:40:18 +02:00
Nils Adermann 1e4df0690a Shorter boolean conversion 2014-04-10 12:10:45 -07:00
Jay 556aceeaaa Removing dist reference info from Artifact Repository
The getComposerInformation method adds dist information to package. This includes reference, which holds the name of the zip file. For e.g. "MyPackage-1.2.zip". 

Now, when using satis for hosting these packages, it uses the same code for archiving composer packages implemented at https://github.com/composer/composer/blob/master/src/Composer/Package/Archiver/ArchiveManager.php

In the implementation, getPackageFilename() adds the distReference info to the file name, which makes the zip file created at the end to be weird. Like "jay-logger-1.2-MyPackage-1.2.zip.tar". I am not sure if there is any other use of dist reference in Artifact Repository, but this would stop causing that issue.
2014-04-10 13:26:26 -05: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 a023c7929a Merge pull request #2895 from SlikNL/classmap-warning-example
Improve ambiguity warning test coverage and avoid ambiguity warning for example directories
2014-04-10 15:28:36 +02:00
Denis Sokolov 836534067b Avoid ambiguity warning for example directories as well
In particular, PEAR repositories use a classmap and example directories trigger
multiple false positive warnings.
2014-04-10 21:03:35 +09:00
Denis Sokolov 65b9cca7b5 Fix ClassMapGenerator unambiguousReference test coverage
Without this fix the test only covers having files in "test", the "fixture"
portion it is not covered at all, because all fixtures in phpunit tests
are already in "test" directory
2014-04-10 21:03:26 +09:00
Nils Adermann e93eeca13a Merge pull request #2894 from naderman/update-no-dev
Add an --update-no-dev option to the require command
2014-04-09 20:29:46 -07:00
Nils Adermann 8aac44d57d Merge pull request #2893 from naderman/require-delete-duplicate
When requiring a package remove it from require-dev and vice versa
2014-04-09 20:13:34 -07:00
Nils Adermann a2b227740a Add an --update-no-dev option to the require command 2014-04-09 20:08:10 -07:00
Nils Adermann f479db6934 Merge pull request #2892 from ptarjan/patch-1
use HHVM_VERSION
2014-04-09 19:53:38 -07:00
Nils Adermann 465f0e3761 When requiring a package remove it from require-dev and vice versa 2014-04-09 19:46:24 -07:00
Paul Tarjan ddec582ca1 use HHVM_VERSION
this one is better (they are the same)
2014-04-09 15:40:12 -07:00
Nils Adermann 78f2ad95a9 Correctly add decision reason to transaction 2014-04-09 12:08:13 -07:00
Jordi Boggiano e7b82cdd88 Only check in require and for non-platform packages, add flag to make this warning optional, refs #2320 2014-04-09 15:37:50 +02:00
Jordi Boggiano e0004d0656 Merge remote-tracking branch 'stof/validate_unbound_constraints' 2014-04-09 14:51:14 +02:00
Jordi Boggiano f6bf7e4a7b Add dev-master example 2014-04-09 14:50:55 +02:00
Jordi Boggiano d540a2fc2c Merge remote-tracking branch 'origin/master' 2014-04-09 14:47:04 +02:00