added fillColor for charts (only xlsx)#158
added fillColor for charts (only xlsx)#158CrazyBite wants to merge 8 commits intoPHPOffice:developfrom CrazyBite:develop
Conversation
Adding an empty cell condition
…into develop # Conflicts: # src/PhpSpreadsheet/Chart/DataSeriesValues.php
|
It seems there are code style errors. You can fix them automatically with |
|
|
||
| /** | ||
| * Create a new DataSeriesValues object | ||
| >>>>>>> aea557bd70f6e4ac13ca625c342fce26ad544331 |
There was a problem hiding this comment.
This kind of leftover from a not well resolved conflict should be removed
|
@PowerKiKi already fixed, but it's wrong again ... |
|
It seems you used a different PHP-Cs-Fixer with a different configuration than the one shipped with this project ( |
|
I hate travis :C |
|
To avoid waiting on Travis every time, you can reproduce the check done by Travis locally with the following lines (saved in #!/bin/bash
set -xe
./vendor/bin/php-cs-fixer fix --dry-run --diff
./vendor/bin/phpcs --report-width=200 --report-summary --report-full samples/ src/ tests/ --standard=PSR2 -n
./vendor/bin/phpunit |
|
I fixed a few stuff and merged it, thanks. Next time we'll have to cover new code with unit tests though... |
This is an follow-up for PHPOffice#158 Fixes PHPOffice#768
For now it is only to write to Xlsx Closes PHPOffice#158
This is an follow-up for PHPOffice#158 Fixes PHPOffice#768
2 participants
@PowerKiKi , I think my develop branch already rebuilded ..