1
0
Fork 0
Commit Graph

1448 Commits (827d52cccf640f2924ca05453af70e3a8203f269)

Author SHA1 Message Date
Sam Minnee 2cd698874f Include pre-releases in >=2.3.0 comparison. Fixes #4080.
This is a change to the >=2.3.0 comparison. Without this change, such a
comparison will exclude pre-release versions.

The rationale is that this makes the comparison more consistent with
<2.3.0 (which excludes all pre-releases) and ~2.3.0 (which includes
pre-releases).
2015-06-30 13:10:20 +01:00
Rob Bast 0298cdc60d change delimiter to curly braces 2015-06-30 13:52:47 +02:00
Rob Bast e698636af4 added test to reproduce #4183 2015-06-29 09:42:40 +02:00
Jonathan Eskew 24c4322672 Use 5.3 compatible array syntax 2015-06-28 13:47:00 -07:00
Jonathan Eskew 868a872df2 Push the hash to $GLOBALS 2015-06-28 13:44:43 -07:00
Jonathan Eskew 61ed7a9547 Explicitly check if a file has already been required before requiring it 2015-06-27 14:05:59 -07:00
Rob Bast fd34c5883a added php script handler info as well 2015-06-24 09:21:36 +02:00
Remi Collet c350bceeea Set this test as slow 2015-06-21 07:46:08 +02:00
Jordi Boggiano ee1e2c6f15 Merge pull request #4167 from wimvds/fix-bitbucket-references
download correct Bitbucket archive reference when using --prefer-dist
2015-06-19 18:54:18 +01:00
Wim Vandersmissen 1ff2a02517 fix to download correct Bitbucket archive reference when using --prefer-dist 2015-06-19 15:07:16 +02:00
Jordi Boggiano a943827371 Show that no version was found in composer show/license if root package is auto-versioned, fixes #4158 2015-06-18 23:47:17 +01:00
Nils Adermann 75c501251d Revert "Merge remote-tracking branch 'naderman/load-no-providers'"
This reverts commit 3e85f82373, reversing
changes made to b025d0982b.
2015-06-18 15:40:27 +02:00
Jordi Boggiano 3e85f82373 Merge remote-tracking branch 'naderman/load-no-providers' 2015-06-18 11:32:37 +01:00
Jordi Boggiano b2173d28fc Fix 5.3.3 build 2015-06-16 11:43:55 +01:00
Jordi Boggiano e73448ae1e Add possessive quantifiers to avoid backtracking and fix segfault on large files, fixes #4153 2015-06-16 11:22:45 +01:00
Jordi Boggiano 8e9659bd83 Merge pull request #4139 from elazar/feature/tests-in-classmap
Resolves #4138: Removed *Test.php filtering from AutoloadGenerator->dump()
2015-06-14 10:10:46 +01:00
Zsolt Szeberenyi 50b560fe4c Add the hash of the parsed content of the composer.json to the lock file, and use it to verify the json is not changed 2015-06-12 22:24:31 +02:00
Jordi Boggiano 89540c5690 Support bg colors and more clearing values in html output formatter 2015-06-12 17:23:18 +01:00
Jordi Boggiano 29dbc3835f Fix html output formatter to work with latest symfony console 2015-06-12 17:10:19 +01:00
elazar 6c029a850c Resolves #4138: Removed *Test.php filtering from AutoloadGenerator->dump() 2015-06-12 10:52:55 -05:00
Rob Bast 9223f4a208 show command by default 2015-06-09 14:02:51 +02:00
Rob Bast 222ee004e0 modified test case 2015-06-09 09:02:32 +02:00
nevvermind 12c833864c Revert converting `1.0.0` to `^1.0`. 2015-06-08 22:45:20 +01:00
Nils Adermann e25b86c129 Fix composer repo test to match what composer repos send 2015-06-08 18:57:56 +02:00
gmsantosxl 84c9c30b63 Remove extra '/' when findShortestPath $from is a directory 2015-06-03 16:48:01 -03:00
Jordi Boggiano 17c2a8019e Merge pull request #4089 from nevvermind/plugin-api-versions
Make plugins have actual constraints instead of fixed versions
2015-06-03 11:37:52 +01:00
Rob Bast d59115d7fa make unit tests assume a disabled entity loader 2015-06-03 10:19:40 +02:00
nevvermind 3032f0a538 Refactor based on code review
- Move the version api getter to the PluginManager And make it such that it can be mocked, but not pollute the public interface. That means "protected" visibility.
- The plugin api version constant should still be used throughout the code.
- Use different fixtures class names
- Use regex possessive quantifiers for performance
- Use full words for readability
2015-06-02 17:40:32 +01:00
nevvermind eb2aa14830 Make plugins have actual constraints instead of fixed versions
Instead of developing plugins against a single, fixed Plugin API version - `"composer-plugin-api": "1.0.0"`, this change will allow plugin developers to use versions like `"composer-plugin-api": "~1.1"` or `"composer-plugin-api": ">=2.1 <3.0"`, aka actual Composer-compatible constraints.

Only the "1.0", "1.0.0" and "1.0.0" Plugin API versions will be regarded as BC versions, and internally converted to "^1.0"; every other declared version string will be kept as it is.

Because of this new constraint flexibility, plugin version mismatches will be skipped, which means those plugin will NOT be registered to the system. Previously, a mismatch triggered a warning, but plugins were still registered.
2015-06-02 14:10:09 +01:00
Rob Bast 89885140d3 Created a failing test case 2015-06-02 15:04:58 +02:00
Rob Bast 46e0a506b9 Added another testcase + fix 2015-06-02 14:20:48 +02:00
Rob Bast a256f3dfca Added one failing testcase and one successful
Demonstrates that it handles x.y.z properly as long as z !== 0
2015-06-02 14:03:45 +02:00
Jordi Boggiano 0081964428 Merge remote-tracking branch 'colinodell/fix-tag-ambiguity'
Conflicts:
	src/Composer/Downloader/GitDownloader.php
	tests/Composer/Test/Downloader/GitDownloaderTest.php
2015-05-31 12:52:27 +01:00
Jordi Boggiano 27aac31970 Fix tests for autocrlf=true checkouts, fixes #4049 2015-05-28 14:43:52 +01:00
Jordi Boggiano 52d290f5f2 trim token just in case and update tests 2015-05-07 00:37:08 +01:00
Nils Adermann 67f10c1601 PHP 5.3 this/that compatibility 2015-05-05 20:32:05 +02:00
Possum 29ca21f30e PHP version checks tweaking 2015-05-05 20:18:24 +02:00
Nils Adermann ec5416f03c loadDev parameter is nonsense, properly load packages in create command 2015-05-05 19:58:03 +02:00
Nils Adermann da02c53540 Update the composer repository whatprovides test to a loadrecursively test 2015-05-05 19:44:07 +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
Jordi Boggiano e8572ca6f9 Merge pull request #3998 from SpacePossum/use_https
Use HTTPS where possible
2015-05-05 16:42:33 +01:00
Jordi Boggiano 0e0cb62fb8 Add test for replace 2015-05-05 11:07:11 +01:00
Possum 2e99b9fdf5 Use https where possible 2015-05-04 19:37:57 +02:00
Nils Adermann 709943aca5 ComposerRepository works differently now, so comment out test until replaced 2015-05-04 17:30:53 +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 414cf70008 Fix phar build test 2015-05-01 14:48:47 +01:00
Jordi Boggiano ebffb3c179 Move improvements towards reproducible builds, refs #3927 2015-05-01 11:54:55 +01:00
Jordi Boggiano d93406a668 Merge pull request #3956 from nevvermind/use-phpunit-preconditions
Use PHPUnit pre-conditions
2015-05-01 10:50:17 +01:00
Cees-Jan Kiewiet c9d9b5085a Replaced <error> with <warning> for abandoned package as it reflects the intention of this feature better 2015-04-30 23:34:26 +02:00
Jordi Boggiano bdb6ecb29e Merge pull request #3975 from marc-mabe/hotfix/3974
fixes #3974: Autoloader have to distinguish between files and directories
2015-04-30 18:26:28 +01:00
Marc Bennewitz 9455c49053 fixes #3974: Autoloader have to distinguish between files and directories 2015-04-30 19:17:19 +02:00
Jordi Boggiano 8a12e50a16 Merge pull request #3983 from alcohol/upgrade-dialoghelper
Upgrade DialogHelper to QuestionHelper
2015-04-30 17:10:26 +01:00
Nils Adermann 258fdcb44d Merge pull request #3986 from Seldaek/partial-update-keep-lock
Partial updates should not corrupt the lock if the installed repo is not up to date with it
2015-04-30 17:54:58 +02:00
Nils Adermann cb44f209f8 Merge pull request #3985 from Seldaek/update-urls
Check if package URLs are up to date after composer update is done
2015-04-30 17:48:43 +02:00
Jordi Boggiano 137c551247 Check if package URLs are up to date after an update op is done, fixes #3214 2015-04-30 16:41:28 +01:00
Jordi Boggiano 4507805508 Partial updates should not corrupt the lock if the installed repo is not up to date with it, fixes #3439, closes #3553 2015-04-30 16:39:08 +01:00
Nils Adermann b4ed331168 The Solver Request no longer depends on the Pool 2015-04-30 17:24:24 +02:00
Rob Bast 8cc6e4f67d Fixed two camelcase names 2015-04-30 12:17:13 +02:00
Rob Bast 1213d368f6 Updated tests for new QuestionHelper flow 2015-04-30 12:16:33 +02:00
Jordi Boggiano d6620195e5 Prioritize repository over package versions in the default policy, fixes #3509 2015-04-30 10:43:04 +01:00
Jordi Boggiano 00ca2a91a3 Fix typo 2015-04-30 00:08:45 +01:00
Jordi Boggiano 4ce0adb23c Use the caret operator for all require operations 2015-04-29 23:53:40 +01:00
Jordi Boggiano 43c1caad0d Merge remote-tracking branch 'Seldaek/caret-op-for-semver'
Conflicts:
	tests/Composer/Test/Package/Version/VersionSelectorTest.php
2015-04-29 23:49:27 +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
Jordi Boggiano a57c51e8d7 Finalize platform override feature
- Added tests, docs
- Persist to lock file
- Add support in config command
- Added to json schema
2015-04-29 22:38:07 +01:00
Andrew Berry 5b7c5cf41e Fix missing semicolons. 2015-04-23 12:56:11 -04:00
Andrew Berry 59e14ff098 Fix test classes with invalid PHP. 2015-04-23 12:45:27 -04:00
Adrian Dragus 7834dacb88 Forgot to remove the actual calls 2015-04-21 01:26:09 +01:00
Adrian Dragus 96ff1c5014 Use PHPUnit pre-conditions
See https://phpunit.de/manual/current/en/incomplete-and-skipped-tests.html#incomplete-and-skipped-tests.requires.tables.api
2015-04-21 01:15:28 +01:00
Rob Bast b99d9465c1 Added testcase 2015-04-20 13:09:18 +02:00
Steve Buzonas b44c3bee52 add tests to cover different use cases of package install preferences 2015-04-18 20:59:51 -04:00
Steve Buzonas 73c1f8c0e0 prefer strings for install handling when possible 2015-04-18 18:31:16 -04:00
Steve Buzonas 124739d055 fix preference resolution to be backwards compatible 2015-04-18 18:25:59 -04:00
Jordi Boggiano e50b5fe990 Merge pull request #3853 from hakre/fix/git-checkout
Git Checkout Branch / File Differentiation
2015-04-15 02:46:16 +01:00
Jordi Boggiano 46924cf5f5 Merge pull request #3854 from hakre/fix/symlink-missing
Prevent fatal error on missing symlink() function in tests
2015-04-15 02:43:13 +01:00
Jordi Boggiano 6b3178b169 Merge remote-tracking branch 'isoroku/fix-misspellings'
Conflicts:
	doc/articles/handling-private-packages-with-satis.md
2015-04-15 02:21:44 +01:00
Jordi Boggiano d0695b2a6d Merge pull request #3784 from slbmeh/feature/update-rm-tests
Use data provider in RepositoryManager tests
2015-04-15 01:36:01 +01:00
jakoch 74a077dd3d updated spdx-license handling to include metadata
issue https://github.com/composer/composer/issues/3744

summary of changes
- replaced bin script "fetch-spdx-identifiers" by "update-spdx-licenses"
- "update-spdx-licenses" uses "Composer/Util/SpdxLicensesUpdater" to update "spdx-licenses.json" file with license identifier, fullname and osi-approved-status
- dropped "spdx-identifiers.json" (identifiers only)
- dropped "SpdxLicenseIdentifier", it's just "SpdxLicense" now
- modified "ShowCommand" to output the license with metadata and removed some unused method arguments (cleanup)
2015-03-29 22:46:38 +02:00
msiebeneicher 7522a33079 Merge branch 'master' of https://github.com/composer/composer into add_exclude
# By Jordi Boggiano (30) and others
# Via Jordi Boggiano (37) and Morgan Campbell (1)
* 'master' of https://github.com/composer/composer: (83 commits)
  Update 01-basic-usage.md
  Revert 331425bcb3 as well, fixes #3612
  Revert "Disable overwrites when no-ansi is present, fixes #3612"
  Update deps
  Use justinrainbow/json-schema 1.4
  Improved wording
  Fix docs basic-auth => http-basic
  Add test for Generics class
  Single variable for traits and enums
  Use HHVM_VERSION instead of HPHP_VERSION
  Add support for using classmap to autoload Hack enums
  Re-use existing autoloader suffix if available, fixes #3701
  Report Travis CI build success early
  Test on HHVM nightly releases. Allow to fail.
  Make parseJson safer
  Use get home from Config instead of factory
  Fix env override regression, fixes #3820
  [create-project] Used no progress value for dependencies
  Add docBlock and fix CS
  Fix output of first line of progress when output is not decorated, refs #3818
  ...
2015-03-25 16:27:23 +01:00
Andreas Möller 32538a21a2 Enhancement: Sort packages by importance, then alphabetically 2015-03-25 14:10:20 +01:00
Jordi Boggiano 66b73ea456 Revert "Disable overwrites when no-ansi is present, fixes #3612"
This reverts commit e0d36e19eb.

Conflicts:
	src/Composer/IO/ConsoleIO.php
2015-03-24 01:31:53 +00:00
isoroku e0657b60a2 Fix misspellings 2015-03-20 14:23:24 +00:00
hakre 03b634d114 Prevent fatal error on missing symlink() function in tests
The testsuite didn't run through for me because the php symlink() function
was missing.

It is only available on Windows Visa/Server 2008 or higher.

This commit fixes the issue by checking if the method exists, and if not,
marks the test as skipped because of a non-matching precondition.
2015-03-19 14:42:13 +01:00
hakre 7077803aa4 Git Checkout Branch / File Differentiation
This fixes a minor inaccuracy issue when creating git checkout commands
for branches.

The git checkout command used within `GitDownloader::updateToCommit()`
does not use the "`--`" sequence to separate branch from file parameters.

This leads to an inaccuary as git tries as well the branch name as file
name. If the non-existent branch is actually the name of a file, the file
is checked out. If the non-existent branch is not the name of a file, an
error message is given:

> error: pathspec 'non-existent-branch' did not match any file(s) known to
git.

Both cases are not expected for the program flow in
`GitDownloader::updateToCommit()`.

The only thing that is expected is a non-existent branch to fail to
checkout - but with a different error message:

> // reference was not found (prints "fatal: reference is not a tree:
 $ref")

This can be easily fixed by adding the missing separator when constructing
the command which is applied with this commit.
2015-03-19 12:50:06 +01:00
Fred Emmott 23d5e30fbc Add test for Generics class
Already worked, just adding a test.
2015-03-09 11:29:04 -07:00
Fred Emmott cb1ea889d6 Use HHVM_VERSION instead of HPHP_VERSION 2015-03-09 10:02:10 -07:00
Fred Emmott 33ea86573e Add support for using classmap to autoload Hack enums
fixes composer/composer#3823

Ran tests with both PHP5.5.9-1ubuntu4.5 and HHVM 3.6. Test fails on HHVM only
if I back out the ClassMapGenerator.php change.
2015-03-09 09:38:02 -07:00
Jordi Boggiano b80038804f Fix env override regression, fixes #3820 2015-03-06 16:21:40 +00:00
Jérôme Tamarelle c1edfbb65c Add tests on GitLabDriver
Add an interactive prompt for gitlab token

Update doc for gitlab-domains

Add tests on GitLabDriver::supports

Update doc + CS

Optimize branch detection + fix typos

Fix test on GitLab support as it depends on SSL

Remove useless method + fix repository URL containing .git
2015-03-04 00:08:44 +01:00
Henrik Bjørnskov 782c6303bc Initial GitLab Driver
This is a proof of concept, and mostly done to gather feedback on the
structure of the driver and to see if this is something that Composer
should include in core.

Various review changes based on Stof comments.

* Remove cleanup() as it is implemented by the abstract class.
* Remove wrong comment in getReferences
* Implement getSource (as GitHubDriver does)
* Finish phpDocs for methods.
2015-03-04 00:08:30 +01:00
Jordi Boggiano c7b0628d93 Fix tests 2015-02-27 12:27:56 +00:00
Steve Buzonas 484c04b5e5 update repository manager tests to use data provider and test for exception case 2015-02-26 03:19:26 -05:00
Jérémy Derussé 86e0b847be Allow plugins to register commands 2015-02-26 09:14:25 +01:00
Rob Bast 3d329622d7 overwrite -> overwriteError 2015-02-25 11:00:35 +01:00
Rob Bast cb336a5416 Implement writeError throughout Composer 2015-02-25 11:00:35 +01:00
Jordi Boggiano 0b4a9235f4 CS fixes 2015-02-24 14:22:54 +00:00
Jordi Boggiano c291b07abd Merge pull request #3764 from alcohol/retry-slow-test
retry slow test if timeout occurs
2015-02-23 22:41:42 +00:00
Jordi Boggiano 3efed220a6 Clean up event dispatching code and make package events extend installer events 2015-02-23 15:34:49 +00:00
Rob Bast 85955d82a6 Raise timeout to 5 minutes 2015-02-23 09:57:54 +01:00
Jordi Boggiano efcd1e4247 Merge pull request #3749 from alcohol/allow-setting-packagist-to-false-through-config-command
composer config repositories.packagist false
2015-02-17 19:41:03 +00:00
Jordi Boggiano 306f5518d6 Merge pull request #3750 from DavidPrevot/git
Config Git repository user
2015-02-17 15:34:19 +00:00
Jordi Boggiano 5d3c7ab6b7 Rename test files and descriptions 2015-02-17 14:43:09 +00:00
Jordi Boggiano b4698568d2 Adjust tests and fix installer code to create the pool using locked requirements and not the composer.json reqs 2015-02-17 14:37:33 +00:00
David Prévot e5ede671d2 Config Git repository user
One can’t assume a Git user is already setup for the tests.
2015-02-16 11:55:56 -04:00
Rob Bast ef92a06205 composer config repositories.packagist false
closes #3728, closes #3713, closes #3290, not sure about #3025
2015-02-16 16:44:13 +01:00
Matthias Derer 1425bb7fc3 added tests to reproduce the bug 2015-02-16 13:46:59 +01:00
Jordi Boggiano 781d8cb925 Merge pull request #3740 from bestform/ignore-root-requirements-in-installer
Ignore root requirements in installer when installing from locked state
2015-02-14 17:12:21 +00:00
Jordi Boggiano 53925295c3 Merge pull request #3699 from trivago/non_feature_branches
added non-feature-branches
2015-02-14 15:44:45 +00:00
Matthias Derer c9cff6387a removed requirements from the root package should we install from the lock file 2015-02-13 16:15:34 +01:00
msiebeneicher 98de300878 * Small improvement of the testExcludeFromClassmap unit test 2015-02-12 09:49:42 +01:00
msiebeneicher dad6b05ca7 Merge branches 'add_exclude' and 'master' of https://github.com/trivago/composer into add_exclude
* Resolve conflicts and update unit test
2015-02-11 18:04:57 +01:00
msiebeneicher f28785a49d Merge branches 'add_exclude' and 'master' of https://github.com/trivago/composer into add_exclude
* 'add_exclude' of https://github.com/trivago/composer:

# By Jordi Boggiano (239) and others
# Via Jordi Boggiano (184) and others
* 'master' of https://github.com/trivago/composer: (638 commits)
  Simplified syntax
  github deprecation changes
  fix bug in GitDriver::supports for remote repo
  strict check, testcase(s)
  Fix regex matching and add more tests for addSubNode, refs #3721, fixes #3716
  solve edge case for `composer remove vendor/pkg`
  chmod 644 src/Composer/Command/RemoveCommand.php
  Avoid failing on composer show of lazy providers
  Show more info when a download fails
  Add notion of autoloader skipping autoload-dev rules
  Satis grammar fix.
  remove unused statements
  removed needless output param
  + limit git ls-remote to heads + escape repo url
  add check for remote Repository in GitDriver::supports
  suppress the prefix
  Improve notice about /usr/local/bin
  Reuse current file permissions
  Add the P character to the regex pattern
  Added deprecated warning for the dev option
  ...

Conflicts:
	src/Composer/Autoload/AutoloadGenerator.php
	src/Composer/Autoload/ClassMapGenerator.php
2015-02-11 17:54:35 +01:00
Jordi Boggiano 1f1b334f46 Merge pull request #3711 from alcohol/github-api-v3-deprecations
GitHub api v3 deprecations, closes #3566
2015-02-11 10:28:17 +00:00
Rob Bast a34335a9bb github deprecation changes
- added some tests
- minor bug fixes discovered during testing
- resolved two deprecations (rate limit api and authorizations api)
- added some more comments to make the flow more understandable
2015-02-11 10:18:47 +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
rkerner abc9d60fcc added non-feature-branches to handle non-numeric branches matching configured patterns not been handled as feature branches 2015-02-02 14:36:50 +01:00
Padraic Brady 19e24c5804 Merge branch 'master' into tls-config
Conflicts:
	.travis.yml
	doc/03-cli.md
	src/Composer/Command/ConfigCommand.php
	src/Composer/Command/CreateProjectCommand.php
	src/Composer/Command/DiagnoseCommand.php
	src/Composer/Command/InstallCommand.php
	src/Composer/Command/RequireCommand.php
	src/Composer/Command/SelfUpdateCommand.php
	src/Composer/Command/ShowCommand.php
	src/Composer/Command/UpdateCommand.php
	src/Composer/Config.php
	src/Composer/Downloader/FileDownloader.php
	src/Composer/Factory.php
	src/Composer/Repository/ComposerRepository.php
	src/Composer/Repository/PearRepository.php
	src/Composer/Repository/Vcs/VcsDriver.php
	src/Composer/Util/GitHub.php
	src/Composer/Util/RemoteFilesystem.php
2015-01-29 20:31:56 +00:00
Nils Adermann 2697673666 Merge pull request #3685 from xfornesa/issue3647
fix for issue #3647
2015-01-28 16:17:56 +01:00
Xavier Fornes 8ba8580a28 fix test implementation for php 5.3
refs issue #3657
2015-01-28 11:46:38 +01:00
Nils Adermann 0543a32d39 Merge pull request #3610 from bd808/feature/classmap-authoritative
Add classmap-authoritative config setting
2015-01-28 11:26:28 +01:00
Xavier Fornes bb0a2df293 fix for issue #3657
ConsoleIO writing a message which contains end of lines characters
2015-01-28 08:49:38 +01:00
Nils Adermann 5e5eb069dc Don't use a regex to parse installer tests to allow for longer tests 2015-01-27 17:02:37 +01:00
Jordi Boggiano 7b308a27f6 Merge pull request #3655 from theravel/master
Fix error handling for incorrect "repositories" array
2015-01-20 10:35:14 +00:00
Jordi Boggiano cd38d1e096 Tweaks to also support 1.0-dev style aliases, refs #3480 2015-01-20 10:26:10 +00:00
Dmitry Tarasov 3b678ee379 Fix error handling for incorrect "repositories" array 2015-01-20 13:03:55 +03:00
Damian Mooyman 7bb85ff21e Support aliases for numeric branches. Fixes #3461 2015-01-20 17:42:01 +13:00
Grégoire Paris 091fee8a3b skip some tests when the zip extension misses
It is required for some tests to run.
2015-01-08 21:32:37 +01:00
Bryan Davis 0f2558dab3 Use assertContains in ClassMapAuthoritative checks
Use assertContains instead of assertRegExp when checking for
ClassMapAuthoritative settings.
2015-01-05 12:05:17 -07:00
Jordi Boggiano e0d36e19eb Disable overwrites when no-ansi is present, fixes #3612 2015-01-05 16:17:15 +00:00
Bryan Davis 92455759fc Fix AutoloadGeneratorTest for PHP 5.3.x 2015-01-03 18:01:18 -07:00
Bryan Davis ad1f8e6c5a Add classmap-authoritative config setting
Add a "classmap-authoritative" configuration setting that can be used to
disable searching the various prefix and fallback directories for
classes that have not been registered with the
Composer\Autoload\ClassLoader class map. This setting can be used to
optimize performance by avoiding a potentially large number of
`file_exists` calls when Composer is being used in a program with
additional autoloader facilities. Use of the setting implies
"optimize-autoloader" to ensure that the most complete class map
possible is generated.

Closes #3603
2015-01-03 17:35:25 -07:00
Jordi Boggiano 220bd2bd1e Remove phpunit repo from tests 2015-01-01 16:26:14 +00:00
Jordi Boggiano 0a0ad6c335 Merge pull request #3562 from stof/patch-1
Add the package license for PEAR packages
2014-12-28 15:09:37 +00:00
Christophe Coevoet 9bc6209be9 Fix tests for the pear repository 2014-12-27 00:12:35 +01:00
Christophe Coevoet 267af928df Add a failing testcase for stability flags in complex constraints
Refs #3570
2014-12-22 12:27:56 +01:00
Jordi Boggiano 60ac971419 Fix relative path fetching when a var uses var replacement, fixes #3564 2014-12-17 21:57:27 +00:00
Jordi Boggiano 331bda235c Fix activation of global plugins, fixes #3557 2014-12-16 11:12:13 +00:00
Jordi Boggiano 523aef76d0 Fix tests again.. 2014-12-14 13:46:37 +00:00
Jordi Boggiano 901fd838f3 Merge pull request #3450 from nicolas-grekas/prefer-lowest-stable
add --prefer-lowest and --prefer-stable to update command
2014-12-14 13:02:06 +00:00
Nicolas Grekas e821ac2772 Persist prefer-lowest in composer.lock 2014-12-14 10:29:41 +01:00
Jordi Boggiano 0627d846a5 PluginManager refactoring, fixes #3550 2014-12-13 18:54:42 +00:00
Jordi Boggiano 1622b9a390 Fix tests 2014-12-13 16:14:03 +00:00
Jordi Boggiano 8c3ee03734 Enough intermittent failures already 2014-12-13 15:14:54 +00:00
Jordi Boggiano bef89604e2 Fix parsing of strings, fixes #3543 2014-12-13 14:31:58 +00:00
Nils Adermann e844ead223 Merge pull request #3467 from naderman/fix-update-whitelist-unused
Add test case for removing unused dependencies on whitelisted update
2014-12-13 14:48:24 +01:00
Nicolas Grekas 98b254a3ec split update --prefer-lowest and --prefer-stable 2014-12-13 11:51:30 +01:00
Nicolas Grekas 4a0feb0189 add --prefer-lowest-stable to update command 2014-12-13 11:51:30 +01:00
Andreas Möller 6ddd8d4ec7 Enhancement: Add sort-packages option which allows sorting of packages 2014-12-13 00:24:14 +01:00
Rob d9b8b3611b fixes composer/composer#3546 2014-12-12 22:33:04 +01:00
Jordi Boggiano 76c666e210 Merge pull request #3544 from alcohol/match-event-to-listener-expectation
fix for composer/composer#3382
2014-12-12 18:18:12 +00:00
Rob Bast 113606be7b should fix composer/composer#3382 2014-12-12 18:41:37 +01:00
Jordi Boggiano 55895ab494 Skip tests on hhvm 2014-12-12 13:33:45 +00:00
Jordi Boggiano da881c118b Fix failures 2014-12-12 13:15:34 +00:00
Jordi Boggiano 8dad846613 Add SNI settings for SSL URLs that are proxied, fixes #3204 2014-12-12 12:25:21 +00:00
Jordi Boggiano 7b13507dd4 Fix typo in test 2014-12-11 21:52:29 +00:00
Jordi Boggiano 4a6503fe36 Add suppor for https_proxy, fixes #3204 2014-12-11 17:42:55 +00:00
Jordi Boggiano d4523119ea Use caret operator for 0.x releases when guessing versions, fixes #3518 2014-12-08 17:05:50 +00:00
Jordi Boggiano 06e96a78e2 Update ranges for 0.N versions, refs #3518 2014-12-08 17:04:59 +00:00
Jordi Boggiano 9438f3a58f Use better semver ranges for 0.x versions, fixes #3518 2014-12-08 16:57:27 +00:00
Jordi Boggiano 92f4c1fb35 Allow and ignore semver build metadata, fixes #2422 2014-12-08 15:52:32 +00:00
Jordi Boggiano f363f9d370 Add support for caret (^) operator 2014-12-08 15:39:52 +00:00
Jordi Boggiano ebab9db27a Add support for hyphen ranges 2014-12-08 13:44:42 +00:00
Jordi Boggiano 69ef80124f Add support for capital X in 3.X and || for OR 2014-12-08 12:59:01 +00:00
Jordi Boggiano 4c713978e9 Add more tests and validate that there is only one comma 2014-12-07 18:07:30 +00:00
Jordi Boggiano ca168d478b Spaces are now equivalent to comma in constraints and mean AND 2014-12-07 18:07:29 +00:00
Jordi Boggiano 029f709300 Fix parsing stability suffixes in multi constraints, fixes #1732 2014-12-07 17:46:04 +00:00
Jordi Boggiano 46d8e50bf3 Fix test on windows 2014-12-07 14:02:17 +00:00
Jordi Boggiano fc3c7838b2 CS fixes 2014-12-07 13:54:29 +00:00
Christophe Coevoet ea44412476 Skip the phar building on HHVM
Building a phar does not work on HHVM. It looks like it tries to read the phar file which does not exist yet.
2014-12-02 14:31:37 +01:00
Jordi Boggiano f291bf6f5c Merge pull request #3481 from naderman/optimize-solver
Solver optimizations
2014-12-01 19:05:42 +00:00
Nils Adermann 26598c4a9a Remove unnecessary pool reference from rules 2014-12-01 19:02:50 +01:00
Nils Adermann d77400ade2 Make ruleById lookup table in rule set public
Saves about 500k function calls on a packagist update
2014-12-01 18:28:45 +01:00
Nils Adermann 540dfacfa0 Add test to verify that depency packages get deleted when no longer in lock file 2014-11-26 20:24:30 +01:00
Nils Adermann d884b26aa3 Add test case for removing unused dependencies on whitelisted update 2014-11-26 20:19:37 +01:00
Nils Adermann b23a3cd368 Merge pull request #3423 from Michael-Gusev/patch-1
Issue #3422
2014-11-21 18:59:11 +01:00
Nils Adermann 96955dd23b Merge pull request #3264 from duncan3dc/remove-self-update-warning
Don't display the dev warning time when running self-update
2014-11-21 18:51:14 +01:00
Chris Smith c819bd7e70 Update config tests to not use environment variables 2014-11-21 10:15:17 +00:00
Chris Smith 5a56ebd545 Revert "Backup/restore Composer environment variables"
This reverts commit 725a4fd638.
2014-11-21 10:09:21 +00:00
Chris Smith 725a4fd638 Backup/restore Composer environment variables
The tests could fail if an environment variable replaces an expected
value.
2014-11-21 10:07:56 +00:00
Craig Duncan 647625ddc5 Added some tests for the dev version warning 2014-11-20 18:27:58 +00:00
Chris Smith 0f9128a7d2 Add comment 2014-11-20 16:54:39 +00:00
Chris Smith 2e40f5f586 Add failing test case 2014-11-20 16:54:38 +00:00
Nils Adermann 6f4be698a5 Merge pull request #3325 from rdohms/implementing-abandoned-packages
Abandoned Package Warnings
2014-11-20 13:09:18 +01:00
Michael Gusev a531594a4a Issue #3422
https://github.com/composer/composer/issues/3422
2014-11-17 11:05:23 +01:00
Colin O'Dell f304611014 Fix Git failures due to tag ambiguity (issue #3417) 2014-11-14 10:31:52 -05:00
Jordi Boggiano a309e1d89d Fix tests and run it before the push url updater 2014-10-20 20:16:14 +01:00
Jordi Boggiano 94926218e8 CS fixes 2014-10-17 18:57:27 +01:00
Jordi Boggiano ec0463a400 Add tests for platform packages required by root and avoid creating rules altogether instead of disabling them, refs #3320 2014-10-17 15:30:27 +01:00
alu b7fa302b90 add ignore-platform-package-requirements for update/install commands. 2014-10-08 14:20:36 +09:00
Jordi Boggiano 6e4a21d700 Merge remote-tracking branch 'hakre/patch-2' 2014-10-07 14:10:29 +01:00
Jordi Boggiano 923191a489 Merge remote-tracking branch 'hakre/patch-1' 2014-10-07 13:45:32 +01:00
Jordi Boggiano 95d49ce638 Add additional test for beta without dash separator support, fixes #3331 2014-10-06 12:42:19 +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
Rafael Dohms 346133d2a1 PR Review
- reverted comma removal
- made getReplacementPackage consistent
- removed abandoned flag if false
2014-10-03 15:12:16 +02:00
Rafael Dohms f9f2bbac59 Abandoned packages support
Added warning to the installer process.
If any installed packages are flagged, the user will get a warning at the end
of the install/update process.
2014-10-03 14:48:28 +02:00
Rafael Dohms d6d087d348 Support for Abandoned in Packages
Added parsing for abandoned property into the CompletePackage Object.
2014-10-02 23:53:21 +02:00
Jordi Boggiano b33da336ec Merge remote-tracking branch 'origin/master' 2014-09-30 16:28:01 +01:00
Jordi Boggiano efcdb394d3 Rename *-solve-dependencies to *-dependencies-solving 2014-09-30 16:26:55 +01:00
Jordi Boggiano 81fa284c9b Merge remote-tracking branch 'francoispluchino/installer-events' 2014-09-30 16:18:17 +01:00
Jordi Boggiano 663cda8827 Merge pull request #3142 from francoispluchino/plugin-load-only-one-time
Register plugin only one time when it's present in global and project mode
2014-09-30 15:19:55 +01:00
Jordi Boggiano 472c8a5113 Fix tests on windows, fixes #3141 2014-09-30 15:18:15 +01:00
Jordi Boggiano 55a6a1c3d4 Add support for nested arrays in the json manipulator, fixes #3296 2014-09-24 18:32:10 +01:00
Bastian Hofmann b279dda1c0 Merge branch 'master' of https://github.com/composer/composer 2014-09-24 13:23:49 +02:00
Jordi Boggiano e6165e6495 Tweak rules to allow guessing based on branch aliases and avoid greedy constraints on alpha/beta/RC packages, refs #3096 2014-09-23 15:19:23 +01:00
Jordi Boggiano cf75ec7763 Merge remote-tracking branch 'weaverryan/require-version-select' 2014-09-22 17:48:13 +01:00
Jordi Boggiano 62b5062146 Improve sorting of plugin packages, fixes #3109, refs #2972 2014-09-22 17:04:58 +01:00
François Pluchino 6c6a623229 Fix invalid version format 2014-09-22 11:58:26 +02:00
Bastian Hofmann 204fc207fa Moved config option to not save subversion credentials to repository configuration, added documentation. 2014-09-16 15:16:55 +02:00
Bastian Hofmann 0d0ed59e5c Codestyle fix 2014-09-15 13:21:33 +02:00
Ryan Weaver 895e62e859 Refactoring selection of the "recommended" version (e.g ~1.2) and adding some tests
This also modifies the behavior slightly (from a recommendation by seldaek) to always
propose the minor version of the recommendation (e.g. ~1.2 instead of ~1.2.1).
2014-09-12 11:26:51 -04:00
Ryan Weaver aea2e901a9 Extracting logic into a new class related to selecting the latest version
Also refactored InitCommand slightly so that you can use this "latest version"
functionality when searching for a package as well.
2014-09-12 11:26:51 -04:00
Bastian Hofmann b132e4eae0 Added cacheCredentials config flag for saved SVN credentials to control the --no-auth-cache flag
Example config:

{
    "http-basic": {
        "svn.example.com": {
            "username": "user",
            "password": "password",
            "cacheCredentials": false
        }
    }
}
2014-09-11 11:48:24 +02:00
fduch 18be54693f add support of select from option list in ConsoleIO and NullIO 2014-08-12 13:12:07 +04:00
cw-ozaki d649cfc6a1 Add --no-scripts argument for dump-autoload command 2014-08-08 16:27:19 +09:00
François Pluchino 1067ce4f96 Add installer events 2014-07-29 15:25:16 +02:00
hakre 343d0b5af2 added test removing directory with trailing slash that is symlinked
#3144
#3157
2014-07-28 23:49:44 +02:00
hakre ed507dec9f added test unlinking directory
#3157
2014-07-28 23:36:04 +02:00
François Pluchino 11b945046f Register plugin only one time when it's present in global and project mode 2014-07-21 15:11:38 +02:00
Jordi Boggiano 7b4fcd93d3 Merge remote-tracking branch 'webfactory/issue-2698'
Conflicts:
	src/Composer/Repository/ArtifactRepository.php
2014-07-19 21:35:51 +02:00
Jordi Boggiano 4f0d7e4739 Merge remote-tracking branch 'dzuelke/prefer-stable-lock' 2014-07-19 19:38:00 +02:00
Jordi Boggiano d5294ef91b Update repo url from github and handle trailing slashes, refs composer/packagist#354 refs composer/packagist#423 2014-07-19 18:40:01 +02:00
David Zuelke d47d9eb253 remember prefer-stable setting in composer.lock 2014-07-07 21:20:46 +02:00
Jordi Boggiano 449f8165ef Allow $HOME and ~ usage in all *-dir config values, fixes #3060 2014-06-29 14:47:43 +02: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 08e34858d6 Fix code to use hostname only, refs #3026 2014-06-05 11:14:29 +02:00
Jordi Boggiano 89ec322929 Merge remote-tracking branch 'benja-M-1/feature/svn-auth-from-auth-json' 2014-06-05 11:08:19 +02:00
Jordi Boggiano c0f9a00125 Merge remote-tracking branch 'jakoch/patch-6' 2014-06-05 10:57:43 +02:00
Jordi Boggiano 959cc4d63c Add info about conf file loading to debug output 2014-05-31 16:50:33 +02:00
Benjamin Grandfond a21b0f82db Allow SVN to connect with credentials provided with the auth.json file 2014-05-30 17:14:43 +02:00
Jordi Boggiano 7131607ad1 Fix regression in handling github-oauth settings in auth.json 2014-05-27 16:26:24 +02:00
Mátyás Somfai 2ed0bfc1ba added tests for not updating packages referenced by specific commit hash 2014-05-27 14:23:31 +02:00
Jordi Boggiano 90d1b6e08a Rename basic-auth to http-basic, add docs/schema/config support, add local auth file support, add storage to auth.json, add store-auths config option, refs #1862 2014-05-27 13:50:47 +02:00
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 e23665be59 Fix replacers being picked if whatProvide was called before building the package whitelist, fixes #2991, fixes #2962 2014-05-23 15:22:53 +02:00
Jordi Boggiano 97873a27af Update perforce code 2014-05-07 19:34:41 +02:00
Jordi Boggiano 77163f66fc Add support for mirrors in composer repos 2014-05-07 19:34:35 +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
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
Fabien Potencier 12421dd6b7 fixed class map generator when using a heredoc with spaces 2014-04-28 15:21:22 +02:00
Jordi Boggiano 49d4054e51 Handle files with no php at all, fixes #2910 2014-04-14 12:47:47 +02:00
Jordi Boggiano b437c1cc05 Support github auth directly in the RemoteFilesystem class 2014-04-11 14:29:17 +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
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
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 d99212da52 Fix integration tests 2014-04-07 11:10:57 +02:00
Jordi Boggiano 0902305196 Fix classmap generator warnings and tests 2014-04-01 14:38:31 +02:00
Jordi Boggiano 8974a1ac92 Ignore ambiguous classes in tests/fixtures dirs, fixes #2858 2014-03-31 21:36:48 +02:00
Daniel Karp e3be04c443 Don't show Ambiguous class resolution warning if class when not ambiguous
if a class or interface is defined twice in the same class, this should not produce a warning
2014-03-30 12:53:15 -04:00
Jordi Boggiano 7daf876d70 Fix test because the order of filesystem iteration is non deterministic 2014-03-29 18:10:32 +01:00
Jordi Boggiano 781c97fa9b Refactor to avoid global static state 2014-03-29 17:46:55 +01:00
Jordi Boggiano c3ab09750d Merge remote-tracking branch 'johnikx/ambiguous-reference-warning' 2014-03-29 17:29:55 +01:00
Jordi Boggiano f233383de8 Merge pull request #2834 from vuhl/master
Fixing perforce driver/downloader bugs
2014-03-26 18:28:52 +01:00
Clark Stuth a12c4e2a17 Removed getWindowsFlag and setWindowsFlag methods from Perforce object. 2014-03-25 08:30:44 -05:00
Clark Stuth dd1fd0e306 fixed perforce to reference labels instead of invalid tags 2014-03-24 15:19:35 -05:00
Jan Brecka b94838169d show warning only instead of throwing exception 2014-03-24 14:34:02 +01:00
Jan Brecka de09c5e371 remove duplicity 2014-03-24 10:35:44 +01:00
Jan Brecka 5763685e69 use statement 2014-03-24 10:30:50 +01:00
Jordi Boggiano 808e65f7de Merge pull request #2769 from sndpl/issue/2739
Fix for #2739 (and #1755), added support for directory excludes in the gitignore file
2014-03-23 22:01:39 +01:00
Clark Stuth 2651cbc5fe Fixing perforce dev-master stored reference bug. 2014-03-21 13:51:18 -05:00
Clark Stuth 8fc1961463 Fixing delete client workspace bug. 2014-03-21 13:51:18 -05:00
Clark Stuth c11105dd60 Fixing bug not cleaning up workspaces. 2014-03-21 13:51:18 -05:00
Clark Stuth 492539101c got all unit tests passing 2014-03-21 13:51:18 -05:00
Clark Stuth 24dd42267f almost all unit tests passing after IOInterface dependency refactor. no longer passing IOInterface into any Perforce methods 2014-03-21 13:51:18 -05:00
Clark Stuth 0f7b078d6c added new dependency to Perforce object, updating some tests. 2014-03-21 13:51:18 -05:00
Jan Brecka ea7717c8e5 improve exception message 2014-03-20 14:24:42 +01:00
Jan Brecka 13b57112a9 Throw RuntimeException when ambiguous reference was found. 2014-03-20 13:37:05 +01:00
Christian Flothmann 2241328934 fix "replace-alias.test" test 2014-03-12 16:35:04 +01:00
Christophe Coevoet b639005f29 Added a failing test for #2626 2014-03-12 15:10:25 +01: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
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
Pádraic Brady 6c7dd39837 Merge branch 'master' of github.com:composer/composer into tls-config 2014-03-02 18:58:31 +00:00
Jordi Boggiano 790a25c348 Adjust dump command, add another test, update docs, refs #1344 2014-03-01 21:21:00 +01:00
Jordi Boggiano 023ff131aa Merge remote-tracking branch 'bamarni/autoload-dev' 2014-03-01 20:28:31 +01:00
Jordi Boggiano 1f2d8908f3 Merge remote-tracking branch 'olvlvl/fix_issue_2598' 2014-03-01 19:56:33 +01:00
Pádraic Brady 306ba77e93 Implement the RemoteFilesystem Factory everywhere...
- also fixes impacted test
2014-03-01 17:01:44 +00:00
Pádraic Brady bf01a55e53 Patch RFS test to set private fileUrl property and pass 2014-02-28 18:46:49 +00: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
Bilal Amarni db91454a13 added an autoload-dev section 2014-02-28 00:27:03 +01:00
Pádraic Brady 81b86acc53 Merge branch 'master' of github.com:composer/composer into tls-config
Conflicts:
	src/Composer/Util/RemoteFilesystem.php
2014-02-27 17:56:32 +00: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
Jordi Boggiano 0d4c2bb7d7 Fix github test 2014-02-26 17:38:58 +01:00
Jordi Boggiano 5067d76dbc Adjust test suite 2014-02-26 16:01:31 +01:00
Pádraic Brady 30c6aa3183 Merge branch 'master' of github.com:composer/composer into tls-config 2014-02-25 18:49:33 +00:00
Pádraic Brady a2bf14e381 Make disableTls a core RemoteFilesystem option - per method invites human error 2014-02-24 19:15:54 +00:00