fbae6b1589
Revert "Merge pull request #3975 from marc-mabe/hotfix/3974"
...
This reverts commit bdb6ecb29e8a12e50a16
2015-08-04 10:34:54 +02:00
42b025776a
Move file identifier calculation to compile time
2015-06-30 09:22:51 -07:00
24c4322672
Use 5.3 compatible array syntax
2015-06-28 13:47:00 -07:00
868a872df2
Push the hash to $GLOBALS
2015-06-28 13:44:43 -07:00
61ed7a9547
Explicitly check if a file has already been required before requiring it
2015-06-27 14:05:59 -07:00
b2173d28fc
Fix 5.3.3 build
2015-06-16 11:43:55 +01:00
e73448ae1e
Add possessive quantifiers to avoid backtracking and fix segfault on large files, fixes #4153
2015-06-16 11:22:45 +01:00
6c029a850c
Resolves #4138 : Removed *Test.php filtering from AutoloadGenerator->dump()
2015-06-12 10:52:55 -05:00
27aac31970
Fix tests for autocrlf=true checkouts, fixes #4049
2015-05-28 14:43:52 +01:00
29ca21f30e
PHP version checks tweaking
2015-05-05 20:18:24 +02:00
9455c49053
fixes #3974 : Autoloader have to distinguish between files and directories
2015-04-30 19:17:19 +02:00
5b7c5cf41e
Fix missing semicolons.
2015-04-23 12:56:11 -04:00
59e14ff098
Fix test classes with invalid PHP.
2015-04-23 12:45:27 -04:00
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 331425bcb3fixes #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
23d5e30fbc
Add test for Generics class
...
Already worked, just adding a test.
2015-03-09 11:29:04 -07:00
cb1ea889d6
Use HHVM_VERSION instead of HPHP_VERSION
2015-03-09 10:02:10 -07:00
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
cb336a5416
Implement writeError throughout Composer
2015-02-25 11:00:35 +01:00
0b4a9235f4
CS fixes
2015-02-24 14:22:54 +00:00
98de300878
* Small improvement of the testExcludeFromClassmap unit test
2015-02-12 09:49:42 +01:00
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
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
0f2558dab3
Use assertContains in ClassMapAuthoritative checks
...
Use assertContains instead of assertRegExp when checking for
ClassMapAuthoritative settings.
2015-01-05 12:05:17 -07:00
92455759fc
Fix AutoloadGeneratorTest for PHP 5.3.x
2015-01-03 18:01:18 -07:00
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
a531594a4a
Issue #3422
...
https://github.com/composer/composer/issues/3422
2014-11-17 11:05:23 +01:00
94926218e8
CS fixes
2014-10-17 18:57:27 +01:00
d649cfc6a1
Add --no-scripts argument for dump-autoload command
2014-08-08 16:27:19 +09:00
ac497feaba
CS fixes
2014-06-10 16:13:12 +02:00
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
12421dd6b7
fixed class map generator when using a heredoc with spaces
2014-04-28 15:21:22 +02:00
49d4054e51
Handle files with no php at all, fixes #2910
2014-04-14 12:47:47 +02:00
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
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
0902305196
Fix classmap generator warnings and tests
2014-04-01 14:38:31 +02:00
8974a1ac92
Ignore ambiguous classes in tests/fixtures dirs, fixes #2858
2014-03-31 21:36:48 +02:00
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
7daf876d70
Fix test because the order of filesystem iteration is non deterministic
2014-03-29 18:10:32 +01:00
781c97fa9b
Refactor to avoid global static state
2014-03-29 17:46:55 +01:00
b94838169d
show warning only instead of throwing exception
2014-03-24 14:34:02 +01:00
de09c5e371
remove duplicity
2014-03-24 10:35:44 +01:00
5763685e69
use statement
2014-03-24 10:30:50 +01:00
ea7717c8e5
improve exception message
2014-03-20 14:24:42 +01:00
13b57112a9
Throw RuntimeException when ambiguous reference was found.
2014-03-20 13:37:05 +01:00
790a25c348
Adjust dump command, add another test, update docs, refs #1344
2014-03-01 21:21:00 +01:00
023ff131aa
Merge remote-tracking branch 'bamarni/autoload-dev'
2014-03-01 20:28:31 +01:00
db91454a13
added an autoload-dev section
2014-02-28 00:27:03 +01:00
40e484ed38
Fixed an issue that would lead to scattered autoloading files
2014-02-20 23:18:48 +01:00
00a6f8e38d
dedicated scope isolation function for autoload_real
2014-02-06 11:53:42 +01:00
aef0483cc9
Merge pull request #2667 from nicolas-grekas/master
...
scope isolation for user includes
2014-02-05 18:24:55 +01:00
6d7b9afc4b
scope isolation for user includes
2014-02-05 17:33:06 +01:00
75cd91657a
Merge remote-tracking branch 'jeromemacias/fix_psr4_classmap_generator'
2014-02-05 09:53:49 +01:00
fcf8e7f515
Random docblock improvements in AutoloadGeneratorTest.
2014-02-04 12:35:50 +01:00
6a9fd1dd60
rename \$package to \$mainPackage in AutoloadGeneratorTest::testOverrideVendorsAutoloading() for clarity.
2014-02-04 12:35:50 +01:00
bb26152de2
docblock comments on properties in AutoloadGeneratorTest
2014-02-04 12:35:50 +01:00
cab6943df0
AutoloadGeneratorTest::testOverrideVendorsAutoloading() - break autoload definitions to multiple lines.
2014-02-04 12:35:50 +01:00
084c11ef51
AutoloadGeneratorTest::testMainPackageAutoloadingWithTargetDir() - Remove PSR-4 from the package in target-dir test, since it is incompatible with target-dir.
2014-02-04 12:35:50 +01:00
01cd990995
Fix PSR-4 autoload classmap generator
2014-02-03 16:53:56 +01:00
b0ec8ee096
* added exclude-from-classmap feature
...
* updated to latest master version
2014-01-27 11:42:54 +01:00
3c5000ad7f
CS tweaks and cleanups, allow "" to set fallback dirs, refs #2459
2014-01-03 16:31:23 +01:00
0a4b18ce86
More interesting generator tests for PSR-4.
2013-12-22 19:58:27 +01:00
bda2bcac13
Fix indentation of assignment in AutoloadGeneratorTest
2013-12-22 19:39:09 +01:00
8966376f40
Verify generation of autoload_psr4.php even if empty.
2013-12-22 19:38:11 +01:00
bbf6278905
AutoloadGenerator to support PSR-4. Tests included.
2013-11-26 02:53:44 +01:00
2c98813431
Add unit tests for ClassLoader, covering PSR-0 and PSR-4.
2013-11-25 23:22:31 +01:00
11a0d16ccc
CS fixes
2013-10-11 20:12:45 -03:00
3c0a620ad5
Fixed path analysis
2013-09-26 14:34:41 +02:00
38917c2047
Add parallel build to travis script
2013-09-25 10:23:48 +02:00
242c58c789
Merge pull request #2179 from naderman/plugins
...
Plugins
2013-09-06 04:42:27 -07:00
9b70b89b8f
Merge pull request #2210 from Firehed/master
...
Change 'generated' notice to @phpdoc-style annotation
2013-09-02 03:12:29 -07:00
786ea2929b
Merge remote-tracking branch 'github-composer/master' into plugins
...
* github-composer/master:
Make sure directories we are downloading to are empty
Fix parsing of trunk in SvnDriver, fixes composer/satis#88
Fix file layout in unit tests
Fix parse error thrown in PHP5.5+
2013-08-31 15:43:25 +02:00
1892f57e47
Fix file layout in unit tests
...
Changes made in previious commit made the output of the file change,
which in turn broke the unit tests. This commit updates the fixtures to
match the new output.
2013-08-30 12:09:17 +00:00
3960edd64e
Turn EventDispatcher into generic solution handling plugins as well
2013-08-30 12:51:41 +02:00
046d55e886
Change 'generated' notice to @phpdoc-style annotation
...
While it isn't an official part of the syntax, it integrates better with other
tools that ignore diffs on generated code.
2013-08-27 16:08:38 -07:00
5369904dd3
autoload_files.php should return an array of files, instead of directly including them.
2013-08-01 15:53:54 +02:00
8e9bdfb4da
Factor the filesCode generation into a separate method.
2013-08-01 15:53:54 +02:00
f98a8f472e
Generate an autoload_files.php next to autoload_namespaces.php and autoload_classes.php
2013-08-01 15:53:54 +02:00
8d0b7f278e
CS fixes
2013-06-13 13:28:24 +02:00
2665c60b2f
Test for bug parsing multiline strings with 'escaped' newlines
2013-05-21 16:29:11 -04:00
60cd875cc2
Added "pre-autoload-dump" event.
...
This event is fired before the autoload file is generated, for either
an install or update command.
2013-05-06 09:37:21 -05:00
5ba147663d
Use ClassLoader::set to initialize the class loader paths
2013-05-05 10:57:21 +02:00
dc71ba557b
Consistently use arrays as paths for a given namespace prefix
2013-05-05 10:56:46 +02:00
5264d0637b
Fix regression added in 33af9eea95, fixes #1841
2013-04-28 22:50:24 +02:00
3ce71466f1
Treat empty paths in autoloader as ".", fixes #1727
2013-04-07 11:34:58 +02:00
07d2f17afe
[Autoload] Make all paths relative for file portability
2013-04-05 15:01:51 +02:00
3499610631
Fixed tests for autoloader generator
2013-04-01 09:28:02 +02:00
48444a028c
Added support for vendor dir excluded from working dir
2013-04-01 09:27:50 +02:00
3cc5698e7b
Allow PHP 5.2 autoloaders to consume namespace, classmap and include path files, fixes #1730
2013-03-27 18:45:33 +01:00
d929a0813a
Prepend the ClassLoader autoloader to avoid calling other previously registered autoloaders, fixes #1699
2013-03-16 16:14:55 +01:00
8d55b9cced
Merge remote-tracking branch 'ronnylt/script-event-post-dump-autoload'
...
Conflicts:
tests/Composer/Test/Autoload/AutoloadGeneratorTest.php
2013-02-22 18:42:29 +01:00
b4c2347b24
Test fixes
2013-02-20 16:50:26 +01:00
5a484cb3a9
Make sure target-dir plays well with classmap and files autoload, for root and deps, refs #1550
2013-02-19 15:23:43 +01:00
ab1256e135
Merge remote-tracking branch 'cmodijk/master'
2013-02-19 14:21:31 +01:00
5127fe8359
added type check to autoloader fixes #1504
2013-02-14 00:10:18 +01:00
255c0be7fc
Added tests for include path flag
2013-02-04 10:12:41 +02:00
84b34b70e0
Add config option to set if the PHP include path should automatically be used when generating the autoloader
2013-01-14 11:15:06 +02:00
e5cbf83185
Added post-autoload-dump script event.
2013-01-10 15:04:20 +01:00
c80cb76b9b
Always prepend autoloaders to avoid tools (i.e. phpunit) taking precedence over the project autoloader
2013-01-08 17:34:37 +01:00
78290945b8
Make sure there is a class to find in the file that must be ignored
2013-01-05 23:40:06 +01:00
514a3cde77
CS fixes
2013-01-05 20:01:58 +01:00
1beccf9f0f
Fix access of the static loader property
2012-12-25 16:08:36 +01:00
45d7eb5b53
Fixed generating packageMap in AutoloaderGenerater (fixes generating include_paths.php file)
2012-12-17 11:13:07 +01:00
03e355f063
Fixed topological sorting of packages in AutoloadGenerator
2012-12-14 15:21:40 +01:00
51eca2cdfc
Fix matching of classes in trailing non-php text, fixes #1409
2012-12-13 17:39:17 +01:00
aefe3a0b11
Add support for .inc files in classmap, fixes #1396
2012-12-08 21:54:51 +01:00
c5f3a6febd
Fix optimized autoloader generation for PSR-0 configs that include non-existent dirs, fixes #1286
2012-11-27 14:23:10 +01:00
de3235a2a4
Add tests to prevent regressions on strings/nowdoc/comment stripping
2012-11-25 14:10:58 +01:00
5a01ada383
Restrict unicode chars allowed to what php core allows, refs #1361
2012-11-25 14:07:06 +01:00
2d7c3c9d27
Tweak #1361 to re-enable support for unicode classnames
2012-11-25 13:52:42 +01:00
530991217b
Support classmap generation for classes without space after class name
...
Class names with multi-byte characters are not supported.
Closes #1360 .
2012-11-25 12:08:50 +01:00
de3188ca7d
Remove target dir for classmap autoloads of the root package, fixes #1308
2012-11-13 17:09:22 +01:00
75da832cd3
Fix parsing of large files that go over the PCRE limits
2012-11-12 12:33:46 +01:00
86bb1be61f
[ClassMapGeneratot] Filter out non php code
...
Otherwise files like https://github.com/propelorm/Propel/blob/master/generator/lib/behavior/i18n/templates/queryUseI18nQuery.php
would fail ("class" keyword would not be filtered out by php_strip_whitespace())
2012-11-12 09:15:35 +01:00
ab48114531
[ClassMapGenerator] Improve error message when the path does not exist
...
i.e. the composer.json has a typo
2012-11-12 07:33:15 +01:00
ff5c428d60
[ClassMapGenerator] Refine the findClasses method
...
The code could not throw
2012-11-12 07:32:47 +01:00
5a763cf010
Fix scanning of empty namespace{} blocks
2012-11-11 16:29:49 +01:00
487e66d0a9
Allow loading of multiple composer autoloaders concurrently, fixes #1248
2012-11-10 21:54:23 +01:00
1ff1b8ac1f
Sorted generated classmap
2012-10-17 12:00:45 +02:00
c63f0d9642
Preserved original position of package if required packages are before this
2012-10-17 10:50:53 +02:00
e75abcbb41
Fixed order of packages in the classmap autoloader
2012-10-17 01:40:15 +02:00
b683aeb586
Fix expected values in tests for autoloader generator
2012-10-17 01:00:11 +02:00
fd58c24a9f
ComposerAutoloaderInitXXX::getLoader behaves like a ClassLoader singleton
...
Calling ComposerAutoloaderInit::getLoader twice when a package requires a .php file containing functions, lead to the functions to be declared twice, and cause an error.
In my case, using behat + symfony2extension + assetic, the error that occured:
PHP Fatal error: Cannot redeclare assetic_init() (previously declared in vendor/kriswallsmith/assetic/src/functions.php:20) in /vendor/kriswallsmith/assetic/src/functions.php on line 26
Fatal error: Cannot redeclare assetic_init() (previously declared in /vendor/kriswallsmith/assetic/src/functions.php:20) in /vendor/kriswallsmith/assetic/src/functions.php on line 26
2012-09-14 11:21:34 +02:00
9d8db4e148
AutoloadGenerator: respect dependencies, when requiring files
2012-09-06 15:07:07 +02:00
66b83a39d2
Removed a PHP notice when dumping the autoloader
...
This occured when the root package has a target-dir but does not have
configure a PSR-0 autoloader.
Fixes #1028
2012-08-24 23:25:14 +02:00
d6de4a0036
Rename Package interfaces to reduce BC issues
2012-08-24 02:29:31 +02:00
521bbe6556
CS fixes
2012-08-18 16:22:15 +02:00
2af2c27168
Add regression test for files autoload in root package, fixes #880
2012-08-18 14:58:55 +02:00
44d7d4a38e
Make PSR0 scanning optional
2012-08-14 20:28:49 +02:00
48c46ce3b6
Automatically generate classmaps for all PSR-0 packages to speed things up, fixes #541 , fixes #127
2012-08-14 19:55:30 +02:00
4f0ad98905
Always include the ClassLoader since autoload_real is included only once, refs #963
2012-08-14 19:13:39 +02:00
30fdf379aa
Minor consistency tweaks
2012-08-14 19:05:34 +02:00
d2dc73e361
[Autoload] Set $vendorDir et $baseDir in ComposerAutoloaderInitTargetDir::getLoader()
2012-08-06 11:33:17 +02:00
4c82c35dbc
[Autoload] Generate the autoloader_real file in the target directory
2012-08-06 10:56:57 +02:00
2c065416eb
[Autoload] generate an autoload_real.php file
2012-08-01 10:12:46 +02:00
963fedc9a5
[Autoload] remove closures because of a bug in APC
...
https://bugs.php.net/bug.php?id=52144
https://bugs.php.net/bug.php?id=61576
2012-07-31 20:17:39 +02:00
8cf43868da
update tests for new expectations.
2012-07-27 09:13:39 -05:00
6fb5d26474
Revert "Add test and some fixes to allow absolute paths, refs #869"
...
This reverts commit a2a2f4af59
2012-07-18 18:40:17 +02:00
a2a2f4af59
Add test and some fixes to allow absolute paths, refs #869
2012-07-18 18:31:22 +02:00
51404659ef
Change the order of the include paths
...
Composer installed libraries should have precedence over other libraries in the
system (like PEAR installed libraries).
Made composer prepend it's include_path configuration instead of appending it.
2012-07-06 14:17:27 -04:00
d84273ee34
Merge pull request #833 from Seldaek/installmgr_cleanup
...
Use the config object to define the vendor dir and not the installation manager
2012-07-01 10:04:09 -07:00
adaa788955
Require file autoloads after the autoloader is registered
2012-06-25 11:39:51 +02:00
b876dcbafb
Use the config object to define the vendor dir and not the installation manager
2012-06-24 21:58:51 +02:00
f4e9dd4fb8
Fixed PSR rules
2012-06-14 12:10:01 +02:00
1df9c62583
Cosmetic fixes to autoload generation
2012-06-11 14:15:08 +02:00
5c5e962b5a
Add Files Autoloading key. This is a necessary feature to allow purely or partly functional libraries to be "autoloadable" by composer by calling require_once on every file in the "autoload"."files" list.
2012-06-02 18:18:33 +02:00
1bd4ccbd54
php-cs-fixer magic
2012-05-22 12:07:08 +02:00
1a255420b0
Ignore aliases in autoload generator
2012-05-14 14:02:02 +02:00
aff7745231
Fix target-dir autoloader
2012-04-23 10:56:46 +02:00
15ab5868a3
Move composer metafiles back in a composer dir, except autoload.php
2012-04-22 22:18:19 +02:00
51711c2f73
Fix multi-prefix handling
2012-04-19 22:08:24 +02:00
Nicolas Grekas