Commit Graph

1261 Commits

Author SHA1 Message Date
Progi1984 4d65197b03 Merge branch 'psr2' of https://github.com/PHPOffice/PHPExcel into psr2 2015-05-17 12:12:10 +02:00
Progi1984 6b1764f771 PSR2 Fixes 2015-05-17 12:11:56 +02:00
MarkBaker b531fd487e Merge branch 'psr2' of https://github.com/PHPOffice/PHPExcel into psr2 2015-05-17 10:23:26 +01:00
MarkBaker f0fdc9430b More PSR-2 work, and eliminate duplicate code in Row/Column dimensions by extension of an abstract Dimension class containing common code/properties 2015-05-17 10:22:51 +01:00
Progi1984 9140e3da2e PSR2 Fixes 2015-05-17 11:22:28 +02:00
MarkBaker 4a6686e2dd Merge branch 'psr2' into develop 2015-05-17 00:48:21 +01:00
MarkBaker 334747867d Merge branch 'psr2' of https://github.com/PHPOffice/PHPExcel into psr2
Conflicts:
	Classes/PHPExcel/Shared/PCLZip/pclzip.lib.php
2015-05-17 00:47:17 +01:00
MarkBaker 1663ef141c More psr-2 changes 2015-05-17 00:16:41 +01:00
MarkBaker 61e81377cb Yet more of the psr-2 work 2015-05-16 23:18:40 +01:00
Progi1984 082fb1b475 PSR2 Fixes 2015-05-16 23:09:31 +02:00
Progi1984 f827a25af2 PSR2 Fixes 2015-05-16 19:00:31 +02:00
Progi1984 1bf5ea414b PSR2 Fixes 2015-05-16 13:04:38 +02:00
MarkBaker 2af5e55f2c Merge branch 'psr2' into develop 2015-05-15 23:42:53 +01:00
MarkBaker 4c8dd00dff More psr-2 goodness 2015-05-15 23:41:50 +01:00
Progi1984 121eccd4c8 PSR-2 : Fixes 2015-05-15 13:36:15 +02:00
Progi1984 5508013569 PSR-2 : Fixes 2015-05-15 13:17:40 +02:00
Progi1984 96f3d0e6ee PSR-2 : Fixes 2015-05-15 12:55:10 +02:00
MarkBaker e18ba38f16 More psr-2 for charts 2015-05-15 09:11:18 +01:00
MarkBaker 1c26425915 Merge branch 'psr2' into develop 2015-05-14 23:51:30 +01:00
MarkBaker 66169af898 PSR-2 coding standards for the charting 2015-05-14 23:50:28 +01:00
MarkBaker 7d9f45c176 Merge branch 'psr2' of https://github.com/PHPOffice/PHPExcel into psr2
Conflicts:
	Classes/PHPExcel/Calculation.php
	Classes/PHPExcel/Cell.php
2015-05-13 17:02:34 +01:00
MarkBaker feac76dadf We changed the coding standard to PSR-2, and wow! What happened next was awesome 2015-05-13 17:00:22 +01:00
Progi1984 141a61a908 PSR-2 : Fixes 2015-05-13 13:36:53 +02:00
Progi1984 7d086fdbee PSR-2 : Fixes 2015-05-13 13:15:55 +02:00
Progi1984 2881bca443 PSR-2 : Fixes 2015-05-13 12:27:01 +02:00
MarkBaker 06c1ea78de PSR-2 goodness 2015-05-13 08:32:01 +01:00
Progi1984 d85222b45a PSR2 : Improve Travis Test 2015-05-13 08:02:23 +02:00
Progi1984 e018257896 PSR2 : Improve Travis Test 2015-05-13 08:02:03 +02:00
MarkBaker b057a52377 Merge branch 'develop' of https://github.com/PHPOffice/PHPExcel into develop
Conflicts:
	.travis.yml
	composer.json
2015-05-13 01:35:34 +01:00
MarkBaker 4a977f1848 Fixed merge errors 2015-05-13 01:29:12 +01:00
MarkBaker 99b0beb721 Merge branch 'psr2' of https://github.com/PHPOffice/PHPExcel into psr2
Conflicts:
	Classes/PHPExcel/Calculation.php
	Classes/PHPExcel/Shared/CodePage.php
	Classes/PHPExcel/Shared/Date.php
	Classes/PHPExcel/Shared/ZipArchive.php
2015-05-13 00:45:56 +01:00
MarkBaker f7296f58b4 More PSR-2 goodness.... getting there slowly 2015-05-13 00:40:55 +01:00
Progi1984 f37630e938 PSR-2 : Fixes 2015-05-12 17:57:29 +02:00
Progi1984 5bb747f8cc PSR-2 : Fixes 2015-05-12 14:01:22 +02:00
Progi1984 2896d62e08 PSR-2 : Improve Travis CI Report 2015-05-12 13:45:25 +02:00
Progi1984 6850d8a29d PSR-2 : Improve Travis CI Report 2015-05-12 13:36:33 +02:00
Progi1984 d019ce5956 PSR-2 : Improve Travis CI Report 2015-05-12 13:30:05 +02:00
Progi1984 661ff77749 Validation PSR-2 : Fixes 2015-05-12 13:17:41 +02:00
Progi1984 95b3fb024a Validation PSR-2 : Fixes 2015-05-12 12:43:52 +02:00
Progi1984 61b5fa0beb Validation PSR-2 : Tabs to spaces 2015-05-12 11:22:06 +02:00
MarkBaker a86cbaa230 Merge branch 'psr2' of https://github.com/PHPOffice/PHPExcel into psr2 2015-05-12 08:01:33 +01:00
MarkBaker 0d855d0627 More PSR-2 changes 2015-05-12 08:00:59 +01:00
Progi1984 986b20bbb1 Travis CI : Support for PSR-2 test 2015-05-12 08:02:56 +02:00
MarkBaker c70e289dac More efforts to get codebase to conform with PSR-2 coding standards 2015-05-11 22:38:52 +01:00
Progi1984 bb13357dcb Travis CI : Support for PSR-2 test 2015-05-11 12:58:26 +02:00
Progi1984 46dfaa9f8a Travis CI : Support for PSR-2 test 2015-05-11 12:30:47 +02:00
MarkBaker 547d2bd3b2 More PSR-2 2015-05-11 01:31:26 +01:00
MarkBaker 1efa7e8533 More PSR-2 adjustments 2015-05-10 23:25:04 +01:00
MarkBaker c07b54172a More PSR-2 modifications 2015-05-09 14:33:20 +01:00
MarkBaker b8f67c6f4d More PSR-2 changes, and fixes for a couple of breakages introduced by the last commit 2015-05-08 01:09:27 +01:00