948 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Andreas Fischer	cee0f3343b	CS: Fix "PEAR.Formatting.MultiLineAssignment.EqualSignLine" sniff.	2013-12-07 20:47:30 +01:00
Andreas Fischer	452d3dc359	Merge branch 'master' into php5 ... * master: CS: Fix "PEAR.Files.IncludingFile.UseIncludeOnce" sniff.	2013-12-06 12:20:42 +01:00
Andreas Fischer	10b47a1e5a	Merge pull request #203 from bantu/cs-include-once ... CS: Fix "PEAR.Files.IncludingFile.UseIncludeOnce" sniff. * bantu/cs-include-once: CS: Fix "PEAR.Files.IncludingFile.UseIncludeOnce" sniff.	2013-12-06 12:20:36 +01:00
Andreas Fischer	6d1fb9f7db	CS: Fix "PEAR.Files.IncludingFile.UseIncludeOnce" sniff.	2013-12-06 01:03:34 +01:00
Andreas Fischer	64691f2aec	Merge branch 'master' into php5 ... * master: Fix "PEAR.Files.IncludingFile.BracketsNotRequired" sniff.	2013-12-06 00:58:00 +01:00
Andreas Fischer	52e85604e5	Merge pull request #202 from bantu/cs-include-para ... Fix "PEAR.Files.IncludingFile.BracketsNotRequired" sniff. * bantu/cs-include-para: Fix "PEAR.Files.IncludingFile.BracketsNotRequired" sniff.	2013-12-06 00:57:54 +01:00
Andreas Fischer	bc6ff96292	Fix "PEAR.Files.IncludingFile.BracketsNotRequired" sniff.	2013-12-05 23:17:40 +01:00
Andreas Fischer	d696f22b89	Merge pull request #201 from mpscholten/php5-ssh2-microtime ... Replaced php4 hack for microtime(true) with real microtime(true) * mpscholten/php5-ssh2-microtime: Replaced php4 hack for microtime(true) with real microtime(true)	2013-12-05 20:54:11 +01:00
Marc Philip Scholten	d6c70a76d9	Replaced php4 hack for microtime(true) with real microtime(true)	2013-12-05 18:46:46 +01:00
Andreas Fischer	9dd34025e1	Merge branch 'master' into php5 ... * master: Ignore coding style for "HAC 4.49" block in Math/BigInteger.php. CS: Fix PEAR.ControlStructures.ControlSignature sniff.	2013-12-03 21:39:23 +01:00
Andreas Fischer	8271f0fd29	Merge pull request #200 from bantu/cs-else-no-newline ... CodeSniffer: Fix PEAR.ControlStructures.ControlSignature sniff. * bantu/cs-else-no-newline: Ignore coding style for "HAC 4.49" block in Math/BigInteger.php. CS: Fix PEAR.ControlStructures.ControlSignature sniff.	2013-12-03 21:39:17 +01:00
Andreas Fischer	ef2c50f9e0	Ignore coding style for "HAC 4.49" block in Math/BigInteger.php.	2013-12-03 21:04:13 +01:00
Andreas Fischer	161bb7d362	CS: Fix PEAR.ControlStructures.ControlSignature sniff.	2013-12-03 21:04:13 +01:00
Andreas Fischer	23cce39d56	Merge branch 'master' into php5 ... * master: CS: Fix Generic.Functions.FunctionCallArgumentSpacing.NoSpaceAfterComma sniff.	2013-12-03 21:03:56 +01:00
Andreas Fischer	bdaf590d27	Merge pull request #199 from bantu/cs-space-after-comma ... CS: Fix Generic.Functions.FunctionCallArgumentSpacing.NoSpaceAfterComma sniff * bantu/cs-space-after-comma: CS: Fix Generic.Functions.FunctionCallArgumentSpacing.NoSpaceAfterComma sniff.	2013-12-03 21:03:49 +01:00
Andreas Fischer	9ca5f83dec	CS: Fix Generic.Functions.FunctionCallArgumentSpacing.NoSpaceAfterComma sniff.	2013-12-03 20:52:08 +01:00
Andreas Fischer	803042e11e	Merge branch 'master' into php5 ... * master: CodeSniffer: Fix PEAR.Classes.ClassDeclaration.OpenBraceNewLine sniff.	2013-12-03 20:46:44 +01:00
Andreas Fischer	b6dd1f92bf	Merge pull request #198 from bantu/cs-openbrace-class ... CodeSniffer: Fix PEAR.Classes.ClassDeclaration.OpenBraceNewLine sniff. * bantu/cs-openbrace-class: CodeSniffer: Fix PEAR.Classes.ClassDeclaration.OpenBraceNewLine sniff.	2013-12-03 20:46:31 +01:00
Andreas Fischer	e09f1b730e	CodeSniffer: Fix PEAR.Classes.ClassDeclaration.OpenBraceNewLine sniff.	2013-12-03 19:34:41 +01:00
Andreas Fischer	7ee0745f5e	Merge branch 'master' into php5 ... * master: CodeSniffer: Fix Generic.PHP.LowerCaseConstant.Found sniff.	2013-12-03 19:25:38 +01:00
Andreas Fischer	78b5084bf5	Merge pull request #197 from bantu/cs-lowercase-constant ... CodeSniffer: Fix Generic.PHP.LowerCaseConstant.Found sniff. * bantu/cs-lowercase-constant: CodeSniffer: Fix Generic.PHP.LowerCaseConstant.Found sniff.	2013-12-03 19:25:30 +01:00
Andreas Fischer	ca9c8b107b	CodeSniffer: Fix Generic.PHP.LowerCaseConstant.Found sniff.	2013-12-03 18:54:43 +01:00
Andreas Fischer	70717bf1a1	Merge branch 'master' into php5 ... * master: Base CodeSniffer ruleset on PEAR ruleset.	2013-12-01 12:49:23 +01:00
Andreas Fischer	ecd58b6a03	Merge pull request #195 from bantu/code-sniffer-pear ... Base CodeSniffer ruleset on PEAR ruleset. * bantu/code-sniffer-pear: Base CodeSniffer ruleset on PEAR ruleset.	2013-12-01 12:49:17 +01:00
Andreas Fischer	8ef3a01b6e	Base CodeSniffer ruleset on PEAR ruleset.	2013-12-01 03:40:08 +01:00
Andreas Fischer	bdf4f8f58c	Merge branch 'master' into php5 ... * master: Add people from AUTHORS to composer.json.	2013-11-29 23:07:18 +01:00
Andreas Fischer	c85aa97d5e	Merge pull request #182 from bantu/composer-json-authors ... Add people from AUTHORS to composer.json. * bantu/composer-json-authors: Add people from AUTHORS to composer.json.	2013-11-29 23:07:12 +01:00
Andreas Fischer	4d37c36af7	Merge branch 'master' into php5 ... * master: Set the default timezone in tests bootstrap file.	2013-11-29 19:14:10 +01:00
Andreas Fischer	03f290b050	Merge pull request #193 from bantu/tests-default-date ... Set the default timezone in tests bootstrap file. * bantu/tests-default-date: Set the default timezone in tests bootstrap file.	2013-11-29 19:13:59 +01:00
Andreas Fischer	fccf3e8c8a	Set the default timezone in tests bootstrap file.	2013-11-29 09:22:08 +01:00
Andreas Fischer	2f3b6e3646	Update Travis CI build status image branch name to php5.	2013-11-26 21:06:28 +01:00
Andreas Fischer	7500eedfd6	Merge branch 'master' into php5 ... * master: Only install composer dependencies in PHP 5.5 environment. Run code sniffer on PHP 5.5 environment on Travis CI. Add ruleset for phpseclib coding standard. Install composer dependencies on Travis CI. Add composer.lock file. Add CodeSniffer as composer development dependency.	2013-11-26 20:09:35 +01:00
Andreas Fischer	399407fdef	Merge pull request #186 from bantu/code-sniffer ... Introducing Code Sniffer / Ensuring coding standard * bantu/code-sniffer: Only install composer dependencies in PHP 5.5 environment. Run code sniffer on PHP 5.5 environment on Travis CI. Add ruleset for phpseclib coding standard. Install composer dependencies on Travis CI. Add composer.lock file. Add CodeSniffer as composer development dependency.	2013-11-26 20:09:30 +01:00
Andreas Fischer	6e10eb195d	Merge branch 'master' into php5 ... * master: Add Blowfish and Twofish as composer keywords.	2013-11-26 19:35:49 +01:00
Andreas Fischer	1832c1743c	Merge pull request #188 from bantu/more-composer-keywords ... Add Blowfish and Twofish as composer keywords. * bantu/more-composer-keywords: Add Blowfish and Twofish as composer keywords.	2013-11-26 19:35:33 +01:00
Andreas Fischer	bc8615e4ba	Merge branch 'master' into php5 ... * master: Only apply git ignores relative to repository root. Remove all ignores that belong to users global .gitignore file. The composer.lock file belongs to the repository. Do not ignore.	2013-11-26 09:27:43 +01:00
terrafrost	480bc5c277	Merge pull request #184 from bantu/gitignore-cleanup ... Gitignore cleanup	2013-11-25 13:52:04 -08:00
Andreas Fischer	07c9f91cc6	Adjust "Code Coverage Report" branch in link: master -> php5	2013-11-23 22:00:01 +01:00
Andreas Fischer	83db832506	Merge branch 'master' into php5 ... * master: Correct "Code Coverage Report" link to include branch name (master).	2013-11-23 21:59:48 +01:00
Andreas Fischer	82c0bb4b9d	Correct "Code Coverage Report" link to include branch name (master).	2013-11-23 21:59:15 +01:00
Andreas Fischer	28b2ae7849	Add Blowfish and Twofish as composer keywords.	2013-11-23 21:25:26 +01:00
Andreas Fischer	603d1c9417	Merge branch 'master' into php5 ... * master: Updated LICENSE	2013-11-23 21:22:08 +01:00
Andreas Fischer	c9f516dedd	Merge pull request #187 from mpscholten/patch-2 ... Updated LICENSE * mpscholten/patch-2: Updated LICENSE	2013-11-23 21:21:55 +01:00
Andreas Fischer	924bec8058	Merge branch 'master' into php5 ... * master: Use a variable for subfolder string. Use branch name as a subfolder for code coverage reports.	2013-11-23 21:19:11 +01:00
Andreas Fischer	367947d897	Merge pull request #183 from bantu/code-coverage-branch-name ... Use branch name as a subfolder for code coverage reports * bantu/code-coverage-branch-name: Use a variable for subfolder string. Use branch name as a subfolder for code coverage reports.	2013-11-23 21:19:02 +01:00
mpscholten	0a7c5f90d0	Updated LICENSE	2013-11-23 21:18:24 +01:00
Andreas Fischer	e98325b369	Merge branch 'master' into php5 ... * master: Removed vim comments	2013-11-23 21:16:39 +01:00
Andreas Fischer	399308f98a	Merge pull request #180 from mpscholten/removed-vim-comments ... Removed vim comments * mpscholten/removed-vim-comments: Removed vim comments	2013-11-23 21:16:25 +01:00
Andreas Fischer	552459d55e	Only install composer dependencies in PHP 5.5 environment. ... There is currently no point in installing in any other environment.	2013-11-23 21:08:37 +01:00
Andreas Fischer	d09c6c3e6f	Merge pull request #185 from mpscholten/patch-1 ... Removed Php_Compat note in composer.json because we dropped php4 support * mpscholten/patch-1: Removed Php_Compat note in composer.json because we dropped php4 support	2013-11-23 21:06:53 +01:00