1
0
Fork 0
Commit Graph

220 Commits (a979cc78ed141855a76b7f196d24205c41107bbc)

Author SHA1 Message Date
Jordi Boggiano 64ac32fca9 Merge pull request #2785 from Firehed/master
Add @generated annotation to lockfile (ref PR 2210)
2014-05-24 22:57:50 +02:00
Jordi Boggiano 32cd883daa Rename options to transport-options, refs #2189 2014-05-07 18:25:28 +02:00
Jordi Boggiano 31092843fd Only load options when they come from the lock file, not from standard metadata, refs #2189 2014-05-07 18:12:26 +02:00
Jordi Boggiano 016a016455 Merge remote-tracking branch 'lcobucci/master'
Conflicts:
	src/Composer/Downloader/FileDownloader.php
2014-05-07 18:02:46 +02: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
Eric Stern 634d1aba63 Add @generated annotation to lockfile readme, giving a hint for linters and other static analysis tools 2014-03-06 10:15:59 -08:00
Sandy Pleyte 3e161e8ea9 Updated the regexp and added an other test case for sub dirs 2014-02-28 16:30:55 +01:00
Sandy Pleyte 1d51e54a31 Updated the regexp and added more test cases. 2014-02-28 11:43:28 +01:00
Sandy Pleyte 21109ada22 Fix for #2739 (and #1755), added support for directory excludes in the .gitignore file like /directory or directory/ 2014-02-27 15:17:15 +01:00
Zbigniew a4a9d0f0e4 [Archiver] Rules in GitExcludeFilter are too broad 2014-01-30 23:34:28 +00:00
Jordi Boggiano b23742e30c Merge remote-tracking branch 'donquixote/feature/psr4-complete' 2014-01-03 14:56:36 +01:00
Luís Otávio Cobucci Oblonczyk 0f2c0ab389 Merge remote-tracking branch 'upstream/master'
Conflicts:
	src/Composer/Downloader/FileDownloader.php
2013-12-29 00:37:08 +00:00
Pascal Borreli 2f4df9d459 Fixed typos 2013-12-27 11:51:01 +00:00
Andreas Hennings e4bbd83f13 expected message in ValidatingArrayLoaderTest should also contain psr-4 as allowed key. 2013-12-22 19:03:23 +01:00
Jordi Boggiano 80499bb024 Detect ~> misuse and suggest fix, fixes #2476 2013-12-06 13:32:19 +01:00
Morgan BRUNOT ca7cb68dd5 Check exclude from downloaded composer.json 2013-12-05 16:03:48 +01:00
Christophe Coevoet 6cc95c43e3 Add a warning for unbound constraints in the validating loader
Closes #2165
2013-10-12 02:29:16 +02:00
Jordi Boggiano 11a0d16ccc CS fixes 2013-10-11 20:12:45 -03:00
Jordi Boggiano 38917c2047 Add parallel build to travis script 2013-09-25 10:23:48 +02:00
Luís Otávio Cobucci Oblonczyk 8630aab93f Package options must be a non mandatory array and should be loaded when
exists
2013-08-19 04:40:08 -03:00
Luís Otávio Cobucci Oblonczyk 28d0e08785 Package options should be dumped if exists 2013-08-19 04:39:13 -03:00
Jordi Boggiano 0044c75ca0 Fix detection of tags when the current tag is not a valid version 2013-08-12 10:27:25 +02:00
Jordi Boggiano 8b293633ae Merge remote-tracking branch 'simensen/non-dev-version'
Conflicts:
	src/Composer/Package/Loader/RootPackageLoader.php
	tests/Composer/Test/Package/Loader/RootPackageLoaderTest.php
2013-08-12 02:39:52 +02:00
Jordi Boggiano f59f443fce CS fixes and one more test for safety, fixes #1855 2013-08-12 02:22:32 +02:00
Jordi Boggiano 533512879e Merge remote-tracking branch 'sminnee/fix-tilde-constraint-stabililty' 2013-08-12 02:17:00 +02:00
Jordi Boggiano bd345c3b43 Add IO to proc executor in a few more places to get more debug info out 2013-08-10 02:44:11 +02:00
Jordi Boggiano af1f5a3423 Merge pull request #2091 from jaypea/archivemanager
cleanup temporary download location when archiving
2013-08-05 06:26:02 -07:00
Jordi Boggiano d740f50277 Fix parsing of inferred stability flags that are more stable than the min stability 2013-07-28 19:40:37 +02:00
Jan Prieser c6db86e444 cleanup temporary download location when archiving 2013-07-17 13:28:15 +02:00
Jordi Boggiano 8d0b7f278e CS fixes 2013-06-13 13:28:24 +02:00
Jordi Boggiano e848c76cbc Only compare branches as versions in the policy to sort packages, but not in the solver, fixes #1817 2013-05-23 18:12:54 +02:00
Beau Simensen 215556df7c Use --tags to get non-annotated tags as well. 2013-05-21 09:59:41 -05:00
Beau Simensen f9fe39e624 Fixed the existing test and added a new one for git tag version guessing. 2013-05-21 06:14:34 -05:00
Sam Minnee 324ef0f9bb Fixed upper bound of wildcard matches.
Follow-on from 95b4348afa
2013-05-20 19:10:04 +12:00
Sam Minnee 95b4348afa Fixed lower bound of tilde and wildcard matches.
The lower bound of ~1.2 and 1.2.* style version requirements now uses >= 1.2.0.0-dev instead of
> 1.1.9999999.9999999.  This is more straightforward to read, and behaves equivalently.
2013-05-20 19:03:21 +12:00
Sam Minnee 34a21516c8 Fix tilde constraints without a stability suffix to work like wildcard constraints.
With this fix, a tilde constraint such as ~3.1 won't match unstable versions of 3.1,
but a wildcard constraint such as 3.1.* would.  This seems like a confusing
inconsistency, and so I have corrected it.
2013-05-13 11:04:15 +12:00
Jordi Boggiano 9d948eb795 Merge branch 'disjunctive' 2013-05-04 10:48:14 +02:00
Jordi Boggiano faa419cc0e Merge remote-tracking branch 'hason/alias' 2013-04-28 12:54:59 +02:00
Jordi Boggiano 0cccafbe81 Add disjunctive multi-constraints with |, refs #643, fixes #1342 2013-04-27 15:20:35 +02:00
Jordi Boggiano e16caa9bd7 Add EmptyConstraint 2013-04-27 14:32:22 +02:00
Jordi Boggiano 3aa7843146 Use ExecutableFinder instead of relying on exit codes, refs #1829 2013-04-26 11:02:53 +02:00
Jordi Boggiano 91db9d920b Merge remote-tracking branch 'RobLoach/versioncontrolnotfound' 2013-04-26 10:59:25 +02:00
Beau Simensen ffd45b7678 Validate autoload options are of a supported type
Checks to ensure that the autoload options are one of the three supported
autoload types.

closes #952
2013-04-25 14:02:15 -05:00
Rob Loach 692c63cdd2 Fix for tests when Mercurial or git are not available 2013-04-25 14:57:58 -04:00
Martin Hasoň fa0d62ab6a Settings of the same repository for a package is allowed. 2013-04-11 13:25:04 +02:00
Martin Hasoň 753a8345cb Added support for the alias of an aliased package 2013-04-11 13:20:34 +02:00
Jordi Boggiano 069109e0f0 Add readme entry to lock file to explain what it is 2013-04-08 18:15:08 +02:00
Jordi Boggiano 1f79f36227 Add a couple version parser tests 2013-04-04 17:35:55 +02:00
Nils Adermann 57c34033ff Merge pull request #1754 from njam/issue-1754
Fix file pattern start matching if no slash
2013-04-03 05:45:50 -07:00
Jordi Boggiano fc54a48b52 Fix archiver tests on windows 2013-04-02 11:32:11 +02:00
Reto Kaiser 6f72e9570c Add a / to the beginning of a file matchin pattern if no / in rule.
See https://www.kernel.org/pub/software/scm/git/docs/gitignore.html
2013-04-01 23:04:00 +02:00
Reto Kaiser 918a55659e Call realpath() on result of sys_get_temp_dir()
On OSX the temp dir is within /var, which is a symlink to /private/var.
If this is not resolved, the comparison will fail when comparing to the result of `git archive` in testGitExcludes().
2013-04-01 21:37:47 +02:00
Jordi Boggiano bf307de1d6 Fix tests 2013-03-28 20:42:25 +01:00
Nils Adermann 4af69c85ca Fix tests by passing proper working directory to processes 2013-03-28 13:33:40 +01:00
Nils Adermann 6066359944 Skip directories in zip generation, empty dirs won't get archived
This seems ok as we currently rely on git generating archives which does
not archive empty directories either.
2013-03-28 12:49:53 +01:00
Nils Adermann deae50392f Respect gitignore, gitattributes and hgignore files in archiving 2013-03-28 12:49:53 +01:00
Nils Adermann afcdad4b23 Define an option to exclude files in the archive command 2013-03-28 12:49:52 +01:00
Nils Adermann 3e26502561 Remove Mercurial and Git Archivers as they cannot implement exclude rules 2013-03-28 12:49:52 +01:00
Nils Adermann 33828b38df Use a saner file name for package archives 2013-03-28 12:49:52 +01:00
Nils Adermann bcbc50c0d6 Git can handle commit references in git archive just fine so use them 2013-03-28 12:49:52 +01:00
Nils Adermann ba51027680 Reorder ArchiveManager parameters to make the download manager optional 2013-03-28 12:49:52 +01:00
Matthieu Moquet a2b404e421 Cleaned archiver tests 2013-03-28 12:49:52 +01:00
Matthieu Moquet 9d24e17003 Fix workflow & typos 2013-03-28 12:49:52 +01:00
Matthieu Moquet c248115e04 Fix how download manager is constructed
This fixes tests due to upstream changes.
The createDownloadManager in the Factory now takes the config as extra
parameter.
2013-03-28 12:49:52 +01:00
Matthieu Moquet 60b1cc7d24 Create ArchiveManager with the Factory 2013-03-28 12:49:52 +01:00
Matthieu Moquet a733d76b33 Merged zip & tar archivers 2013-03-28 12:49:52 +01:00
Matthieu Moquet bfd2275cb0 Update interface to merge vcs with basic archivers 2013-03-28 12:49:52 +01:00
Matthieu Moquet 2fd17ecff8 Changed Package class due to upstream changes 2013-03-28 12:49:52 +01:00
Matthieu Moquet 20e717f975 Refactored the archiver package 2013-03-28 12:49:52 +01:00
Matthieu Moquet 3d0ce85db2 Moved archive Dumpers into its own Archiver package 2013-03-28 12:49:52 +01:00
Till Klampaeckel 2acb033057 Initial feature-dist
* extends BaseDumper, implements interface
 * put $keys into BaseDumper

 * WIP WIP WIP WIP
 * BaseDumper for utilities
 * interface to enforce 'dump()'
 * feature:
   * supports git
   * supports zip output
   * basic test to cover feature

 * add @todo for later
 * add vendor namespace to package name

 * add extension to getFilename() so we don't need to switch in there (HT, @naderman)

 * add extension (obviously 'zip' in ZipDumper)

 * create archive in destination dir (provided by __construct())

 * condensed ZipDumper
 * moved code to BaseDumper (hopefully easier re-use)

 * use ProcessExecutor from BaseDumper

 * fix assignments in __construct()
 * allow injection of ProcessExecutor

 * fix parameters

 * fix regex

 * write in 'system temp dir'
 * update test case (oh look, a duplicate regex)

 * move working directory related to BaseDumper

 * add quotes

 * place holder for these methods

 * use PharData to create zip/tar when necessary

 * add placeholder calls
 * add call to package() using PharData

 * finish downloadHg(), downloadSvn()

 * put to use

 * make BaseDumper abstract (to force extension)
 * make BaseDumper implement Interface (makes for less code in the implementation)

new functionality for dumping as .tar.gz

tar instead of tar.gz, new abstract dumpertest class

creates a local git repo instead of fetching a remote one

more oo-ish version of it

no constructor

 * refactor tests to be less linux-specific (used Composer\Util to wrap calls)

 * make filename only the version

 * various cs fixes (idention, tabs/spaces, doc blocks, etc.)
 * fixed a typo'd exception name

 * refactored downloading:
   * removed download*() methods
   * added dep on Composer\Factory to setup a DownloadManager instance

 * update CS with feedback from @stof

 * ArrayDumper doesn't extend BaseDumper anymore (hence no conflict on the interface)
 * move keys from BaseDumper back to ArrayDumper
 * interface now declares dump() to always return void

Apparently I had to update the lock.

CS fixes (tabs for spaces)
Bugfix: sprintf() was missing.

Fix docblock for @stof. ;)

Pull in lock from master.

Update lock one more time (hope it still merges).

whitespace

Revert ArrayDumper static keys
2013-03-28 12:49:52 +01:00
Jordi Boggiano ea7d79ab03 Make sure platform requirements of the root package are enforced when installing from lock, fixes #1611 2013-03-03 20:05:46 +01:00
Christian Riesen 6f5ab3ed5c Add other valid versions to test for stability 2013-02-25 16:51:01 +01:00
Jordi Boggiano 97dfbefa72 Add support for arbitrary values for the references in version constraints 2013-02-13 13:26:27 +01:00
Jordi Boggiano 908d2d91da Fix case insensitive matching 2013-02-11 11:52:50 +01:00
perprogramming 704837c574 - Sort links and keywords in ArrayDumper result (fixes issue #1499)
- Adapt ArrayDumperTest
2013-01-31 09:55:19 +01:00
Jordi Boggiano cea4c05021 Fix parsing of ~ version constraint with unstable versions, fixes #1476 2013-01-13 16:36:40 +01:00
Igor Wiedler e7c7e2f70d Consistently describe composer as dep mgr as opposed to package mgr
Closes #1207.
2012-11-07 13:16:47 +01:00
Jordi Boggiano bb685d9c7f Fix license validation and add feedback of values to ease reading 2012-11-05 20:04:29 +01:00
Jordi Boggiano cbd91b5952 Fix FILTER_VALIDATE_URL not supporting IDNs 2012-11-05 15:39:43 +01:00
Jordi Boggiano e05391dc44 Improve validating array loader to avoid false positives 2012-11-05 14:18:04 +01:00
Jordi Boggiano 967c771b26 Add warnings to ValidatingArrayLoader that are simply stripped by default, add reporting of warnings when loading branches 2012-11-05 12:08:02 +01:00
Jordi Boggiano 4b531771bd Add validators for package links and minimum-stability 2012-11-02 15:14:09 +01:00
Jordi Boggiano 573e4b2a7c Merge branch 'newrepo' 2012-10-21 14:18:00 +02:00
Jordi Boggiano a59a5c4581 Merge remote-tracking branch 'simensen/sem-version-support' 2012-10-19 13:55:47 +02:00
Jordi Boggiano beb9a5bd72 Code optimizations: avoid loops in match() 2012-10-14 16:35:32 +02:00
Beau Simensen 081ead1635 Version Parsing: Consider <x.y.z to be <x.y.z-dev
> Consider `<x.y.z` to be `<x.y.z-dev.` Because in 99%
> of the cases that's what the intent is. Could be
> overriden with `<x.y.z-stable`.

- @Seldaek

refs #643
2012-10-08 10:44:37 -07:00
Beau Simensen 96a76eeffc Semantic Version Parsing: ~version
Implemented `~` according to #643 and used the following versions
as a test case as defined by @Seldaek:

 * "~1.2.3.4" = ">=1.2.3.4 <1.2.4.0-dev"
 * "~1.2.3" = ">=1.2.3 <1.3.0-dev"
 * "~1.2" = ">=1.2.0 <2.0.0-dev"
 * "~1" = ">=1.0.0 <2.0.0-dev"

Refs #643
2012-10-06 07:49:11 -07:00
Jordi Boggiano 62bb5b339b Allow parsing of stability modifiers combined with multi-constraints 2012-10-05 19:05:39 +02:00
Martin Hasoň 29034ea3e0 Added support for the root package in the array dumper 2012-09-19 23:08:37 +02:00
Jordi Boggiano 8d7e5cdda5 Fix target-dir with multiple slashes too 2012-09-19 11:25:49 +02:00
Jordi Boggiano a9195eb05f Add a couple test cases 2012-09-18 18:32:24 +02:00
Jordi Boggiano f377e9ca87 Fix possible vendor-dir "evasion" via target-dir 2012-09-18 18:30:11 +02:00
Jordi Boggiano 83239aa338 Update lock file to contain the complete package info, fixes #890 2012-09-14 16:43:56 +02:00
Jordi Boggiano 0932f65a17 Return 7 chars and not 6 for short git hashes, formatting fixes 2012-09-04 16:27:22 +02:00
Jordi Boggiano 338730b19b Merge remote-tracking branch 'zczapran/issue/1043_wrong_output_for_versions_when_updating' 2012-09-04 16:22:29 +02:00
Jordi Boggiano e01a9c564d Fix parsing of stability for lowercased RC versions 2012-09-04 15:59:44 +02:00
Zbigniew Czapran 730f206cea removed unneccesary PackageMock and trailing whitespaces 2012-08-30 23:44:54 +01:00
Zbigniew Czapran 80c2736021 in VersionParser only truncate the version if hash 2012-08-30 22:01:21 +01:00