aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developAndreas Fischer2012-12-051-0/+74
|\ | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10716] Collect standard error from executed php process. [ticket/10716] Skip test if php is not in PATH. [ticket/10716] Exclude our dependencies from linting. [ticket/10716] Only lint on php 5.3+. [ticket/10716] php parse all php files as part of the test suite.
| * Merge remote-tracking branch 'p/ticket/10716' into develop-olympusAndreas Fischer2012-12-051-0/+74
| |\ | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/10716: [ticket/10716] Collect standard error from executed php process. [ticket/10716] Skip test if php is not in PATH. [ticket/10716] Exclude our dependencies from linting. [ticket/10716] Only lint on php 5.3+. [ticket/10716] php parse all php files as part of the test suite.
| | * [ticket/10716] Collect standard error from executed php process.Oleg Pudeyev2012-12-041-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | php executes everything via a shell. The standard error of this top level shell is not captured by exec/shell_exec/popen/etc. and there is no way to capture it. proc_open might work but it is a nightmare to use and without multiplexing reads from standard error and standard output it can deadlock. Thus the solution in this commit. Put the command into a subshell and redirect standard error to standard output for the subshell. PHPBB3-10716
| | * [ticket/10716] Skip test if php is not in PATH.Oleg Pudeyev2012-12-041-0/+8
| | | | | | | | | | | | PHPBB3-10716
| | * [ticket/10716] Exclude our dependencies from linting.Oleg Pudeyev2012-12-041-1/+12
| | | | | | | | | | | | PHPBB3-10716
| | * [ticket/10716] Only lint on php 5.3+.Oleg Pudeyev2012-12-041-0/+5
| | | | | | | | | | | | PHPBB3-10716
| | * [ticket/10716] php parse all php files as part of the test suite.Oleg Pudeyev2012-12-041-0/+49
| |/ | | | | | | PHPBB3-10716
* | Merge remote-tracking branch 'p/ticket/10103' into developAndreas Fischer2012-12-045-72/+266
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/10103: [ticket/10103] New and improved wording. [ticket/10103] Assert with messages. [ticket/10103] assertLessThan/assertGreaterThan. [ticket/10103] Inline assignment is bad? [ticket/10103] $rv had too few characters. [ticket/10103] Correct flock class documentation. [ticket/10103] Try a longer sleep for travis. [ticket/10103] Convert the rest of the tree to flock class. [ticket/10103] Test for flock lock class, with concurrency no less. [ticket/10103] Use flock lock class in messenger. [ticket/10103] Factor out flock lock class.
| * | [ticket/10103] New and improved wording.Oleg Pudeyev2012-12-041-2/+2
| | | | | | | | | | | | PHPBB3-10103
| * | [ticket/10103] Assert with messages.Oleg Pudeyev2012-12-041-2/+2
| | | | | | | | | | | | PHPBB3-10103
| * | [ticket/10103] assertLessThan/assertGreaterThan.Oleg Pudeyev2012-12-041-2/+2
| | | | | | | | | | | | PHPBB3-10103
| * | [ticket/10103] Inline assignment is bad?Oleg Pudeyev2012-12-041-1/+2
| | | | | | | | | | | | PHPBB3-10103
| * | [ticket/10103] $rv had too few characters.Oleg Pudeyev2012-12-041-3/+3
| | | | | | | | | | | | PHPBB3-10103
| * | [ticket/10103] Correct flock class documentation.Oleg Pudeyev2012-12-041-4/+13
| | | | | | | | | | | | PHPBB3-10103
| * | [ticket/10103] Try a longer sleep for travis.Oleg Pudeyev2012-12-041-1/+1
| | | | | | | | | | | | | | | | | | Apparently travis takes longer than half a second to fork php. PHPBB3-10103
| * | [ticket/10103] Convert the rest of the tree to flock class.Oleg Pudeyev2012-12-042-8/+16
| | | | | | | | | | | | PHPBB3-10103
| * | [ticket/10103] Test for flock lock class, with concurrency no less.Oleg Pudeyev2012-12-041-0/+108
| | | | | | | | | | | | PHPBB3-10103
| * | [ticket/10103] Use flock lock class in messenger.Oleg Pudeyev2012-12-041-6/+8
| | | | | | | | | | | | PHPBB3-10103
| * | [ticket/10103] Factor out flock lock class.Oleg Pudeyev2012-12-042-58/+124
| | | | | | | | | | | | PHPBB3-10103
* | | Merge remote-tracking branch 'p/ticket/9983' into developAndreas Fischer2012-12-044-118/+33
|\ \ \ | | | | | | | | | | | | | | | | * p/ticket/9983: [ticket/9983] Make sql cache test into a black box.
| * | | [ticket/9983] Make sql cache test into a black box.Oleg Pudeyev2012-12-034-118/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it non-driver-specific and also makes it possible to make prefix variable private on drivers. PHPBB3-9983
* | | | Merge remote-tracking branch 'p/ticket/10091' into developAndreas Fischer2012-12-044-4/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * p/ticket/10091: [ticket/10091] Bump minimum supported postgresql version to 8.3.
| * | | | [ticket/10091] Bump minimum supported postgresql version to 8.3.Oleg Pudeyev2012-12-044-4/+4
| | |/ / | |/| | | | | | | | | | PHPBB3-10091
* | | | Merge remote-tracking branch 'p/ticket/9983-redis' into developAndreas Fischer2012-12-041-1/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | * p/ticket/9983-redis: [ticket/9983] Correct incorrect markTestSkipped call.
| * | | [ticket/9983] Correct incorrect markTestSkipped call.Oleg Pudeyev2012-12-041-1/+1
|/ / / | | | | | | | | | PHPBB3-9983
* | | Merge PR #1112 branch 'develop-olympus' into developOleg Pudeyev2012-12-042-0/+2
|\ \ \ | |/ / |/| / | |/ | | * develop-olympus: [ticket/11240] Enable PHPUnit's verbose mode so we get a list of skipped tests.
| * Merge PR #1112 branch 'bantu/ticket/11240' into develop-olympusOleg Pudeyev2012-12-042-0/+2
| |\ | | | | | | | | | | | | * bantu/ticket/11240: [ticket/11240] Enable PHPUnit's verbose mode so we get a list of skipped tests.
| | * [ticket/11240] Enable PHPUnit's verbose mode so we get a list of skipped tests.Andreas Fischer2012-12-042-0/+2
| |/ | | | | | | PHPBB3-11240
* | Merge remote-tracking branch 'p/ticket/9983' into developAndreas Fischer2012-12-038-49/+392
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/9983: [ticket/9983] Also check generic APC enable/disable. [ticket/9983] Use APC instead of apc in error messages. [ticket/9983] Skip tests if APC is not enabled for CLI. [ticket/9983] Test for apc cache driver. [ticket/9983] Add phpbb prefix to global variables. [ticket/9983] Empty line by request. [ticket/9983] Indeed, it is <?php. [ticket/9983] Add a test for destroy. [ticket/9983] Exercise exists also. [ticket/9983] Add a purge test. [ticket/9983] Rename test methods. [ticket/9983] get/put cache test moved to a base class. [ticket/9983] Create driver in setup in null driver test. [ticket/9983] Split cache test into per-driver files. [ticket/9983] Add redis cache driver tests.
| * | [ticket/9983] Also check generic APC enable/disable.Andreas Fischer2012-12-031-0/+6
| | | | | | | | | | | | PHPBB3-9983
| * | [ticket/9983] Use APC instead of apc in error messages.Andreas Fischer2012-12-031-1/+1
| | | | | | | | | | | | PHPBB3-9983
| * | [ticket/9983] Skip tests if APC is not enabled for CLI.Andreas Fischer2012-12-031-0/+6
| | | | | | | | | | | | PHPBB3-9983
| * | [ticket/9983] Test for apc cache driver.Oleg Pudeyev2012-12-031-0/+79
| | | | | | | | | | | | PHPBB3-9983
| * | [ticket/9983] Add phpbb prefix to global variables.Oleg Pudeyev2012-12-022-6/+6
| | | | | | | | | | | | PHPBB3-9983
| * | [ticket/9983] Empty line by request.Oleg Pudeyev2012-12-021-0/+1
| | | | | | | | | | | | PHPBB3-9983
| * | [ticket/9983] Indeed, it is <?php.Oleg Pudeyev2012-12-021-1/+1
| | | | | | | | | | | | PHPBB3-9983
| * | [ticket/9983] Add a test for destroy.Oleg Pudeyev2012-12-012-0/+29
| | | | | | | | | | | | PHPBB3-9983
| * | [ticket/9983] Exercise exists also.Oleg Pudeyev2012-12-011-1/+3
| | | | | | | | | | | | PHPBB3-9983
| * | [ticket/9983] Add a purge test.Oleg Pudeyev2012-12-012-0/+21
| | | | | | | | | | | | PHPBB3-9983
| * | [ticket/9983] Rename test methods.Oleg Pudeyev2012-12-013-3/+3
| | | | | | | | | | | | PHPBB3-9983
| * | [ticket/9983] get/put cache test moved to a base class.Oleg Pudeyev2012-12-014-14/+40
| | | | | | | | | | | | PHPBB3-9983
| * | [ticket/9983] Create driver in setup in null driver test.Oleg Pudeyev2012-12-011-3/+10
| | | | | | | | | | | | PHPBB3-9983
| * | [ticket/9983] Split cache test into per-driver files.Oleg Pudeyev2012-12-014-208/+251
| | | | | | | | | | | | PHPBB3-9983
| * | [ticket/9983] Add redis cache driver tests.Oleg Pudeyev2012-12-014-3/+126
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to not overwrite data in default redis store, at least one of redis host or post must be explicitly specified. Redis cache driver constructor has been modified to accept host and port as parameters. This was not added to public API as there are more parameters being passed via global constants. PHPBB3-9983
* | | Merge remote-tracking branch 'p/ticket/11238-develop' into developAndreas Fischer2012-12-031-103/+67
|\ \ \ | | | | | | | | | | | | | | | | * p/ticket/11238-develop: [ticket/11238] Set goutte to 0.1.0 in develop.
| * | | [ticket/11238] Set goutte to 0.1.0 in develop.Oleg Pudeyev2012-12-022-104/+68
| | | | | | | | | | | | | | | | PHPBB3-11238
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-12-031-1/+1
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | | | | | | | | | * develop-olympus: [ticket/11238] Set goutte version to 0.1.0. Conflicts: phpBB/composer.lock
| * | Merge remote-tracking branch 'p/ticket/11238-olympus' into develop-olympusAndreas Fischer2012-12-032-32/+433
| |\ \ | | | | | | | | | | | | | | | | * p/ticket/11238-olympus: [ticket/11238] Set goutte version to 0.1.0.
| | * | [ticket/11238] Set goutte version to 0.1.0.Oleg Pudeyev2012-12-022-32/+433
| |/ / | | | | | | | | | PHPBB3-11238
* | | Merge PR #1065 branch 'dhruvgoel92/ticket/10771' into developOleg Pudeyev2012-12-024-10/+10
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * dhruvgoel92/ticket/10771: [ticket/10771] fix remember me language [ticket/10771] use remember me in ucp [ticket/10771] use remember me in acp [ticket/10771] changed value in help_faq.php [ticket/10771] Using Remember Me instead of autologin or persistent keys