Skip to content

Commit

Permalink
Merge in develop in PR#553 (#1)
Browse files Browse the repository at this point in the history 
* Fix. Text is subscripted when set superscript to false

Reset the subscript to false only when superscript is true
Reset the superscript to false only when subscript is true
Update Testcases

* Fix. Some coding style issues

* Fix. Use space insteadof tab

* Remove temp file

tempnam() creates a file that is not removed. Only $pFilename . '.xlsx' is removed by $this->writeSpreadsheet().

* PHP 5.3 is not supported anymore by Travis CI : https://docs.travis-ci.com/user/languages/php/

* PHPOffice#382 : Improve tests for validating the OOXML Schema

* PHPOffice#382 : Validation for Open XML

* PHPOffice#382 : Validation for Open XML

* PHPOffice#382 : Validation for OpenDocument

* PHPOffice#382 : OpenXML (ISO 29500-1 Strict)

* PHPOffice#382 : OpenXML (ISO 29500-1 Strict)

* FIXED : Missing argument 1 for phpDocumentor\Descriptor\Collection::get()

* PHPOffice#360 : Changelog

* PHPOffice#397 : PowerPoint2007 Reader : Background Color based on SchemeColor

* PHPOffice#355 : Doughnut Chart

* PHPOffice#355 : Doughnut Chart (Changelog & Tests & WIP ODPresentation)

* PHPOffice#355 :
- ODPresentation Writer : Doughnut Chart
- ODPresentation Writer : Support for the position of Legend

* PHPOffice#355 : Fix PHPCS

* PHPOffice#355 : Array to string conversion (PHPPresentation/src/PhpPresentation/Writer/PowerPoint2007/LayoutPack/TemplateBased.php:73)

* PHPOffice#355 : PHP 7.1 is now supported

* PHPOffice#370 : PhpOffice\PhpPresentation\Style\Color : Define only the transparency

* PHPOffice#370 : PowerPoint2007 Writer : Support for fill for transparent image

* PHPOffice#370 : ODPresentation Writer : Support for fill for transparent image

* PHPOffice#370 : ODPresentation Reader : Support for fill for image

* PHPOffice#370 : PowerPoint2007 Reader : Support for fill for image

* PHPOffice#382 : PowerPoint2007 Writer (Validation)

* PHPOffice#382 : Replacement PHPDoc (return self => return )

* PHPOffice#382 : Replacement (rand => mt_rand)

* PHPOffice#382 : ODPresentation Writer (Validation)

*  PHPOffice#382 : ODPresentation Writer (Validation)

* PHPOffice#382 : PHPCS Fixes

* PHPOffice#382 : PHPUnit fixes (PHP 5.4)

* refactoring and reducing cyclomatic complexity

* remove extra space

* adding new line at the end of the file

* Use PHPUnit\Framework\TestCase instead of PHPUnit_Framework_TestCase

* PHPOffice#382 : Fixes nefore merge

* PHPOffice#382 : Fixes Sample 20

* problems accessing files

the casing didn't match the case of the folder names.
the vendor autoload is in a different folder...

* Update Sample_Header.php

* Update Sample_Header.php

* Update Sample_Header.php

* Update Sample_Header.php

added some checks to make sure that the sample outputs are set up correctly.

* Update Sample_Header.php

more checks to make sure the sample code can run

* Fixes some CS

* Refactoring tests

* Trailing whitespaces

Signed-off-by: Gabriel Caruso <[email protected]>

* Remove extra lines

Signed-off-by: Gabriel Caruso <[email protected]>

* Simplify return

* Change group shape extents to reflect content width/height.

Previously the group extents where calculated based on the extents of
the containing shapes using the slide/container of the group as the
point of reference. This would result in the group being larger than
needed; especially noticable for a large X or Y offest.

* Remove % signs from PptCharts to fix chart generation. Fixes PHPOffice#452

* Solve Problems with png transparencies

* Update .travis.yml

* Use proper name for `ext-gd`

`ext-gd2` is  not recognized by composer and should instead be `ext-gd`.

* Create auto_assign.yml

* Fix PHP Docs

* Fix Regression PHP Docs int->float

* Fix double aray in PHPDocs
Fix Typing

* Update .travis.yml

* FIXED : Validation of the composer.json

* PHPOffice#382 Update Composer

* PHPOffice#382 : Fixes ECMA-376

*  PHPOffice#382 : Fixes ECMA-376

*  PHPOffice#382 : Fixes OpenDocument

* PHPOffice#382 : Fixes OpenDocument

* Update composer.json

* Update composer.json

* Composer : PHPUnit

* PHPOffice#382 : Remove options not compatible with latest phpunit version

* PHPOffice#382 : TypeError: Argument 2 passed to PHPUnit\Framework\Assert::assertFileExists() must be of the type string, null given

* PHPOffice#382 : The each() function is deprecated. This message will be suppressed on further calls

* PHPOffice#382 : Error: Call to undefined method PhpOffice\PhpPresentation\Tests\Style\AlignmentTest::setExpectedException()

* PHPOffice#382 : PHPCS Fixes

* PHPOffice#382 : PHPDoc : PHP Fatal error:  Uncaught Doctrine\Common\Annotations\AnnotationException

* PHPOffice#540 : Disable documentation

* PHPOffice#540 : Disable documentation

* fix other image mime type

* Drop the support for HHVM

* Add support for image hyperlinks

* Update CHANGELOD.md

* Display hyperlink properties of Drawing\Gd shape
  • Loading branch information
@Progi1984 @polidog
Progi1984 authored and polidog committed Oct 14, 2019
1 parent 4c546e1 commit 30b8ab9
Show file tree
Hide file tree
Showing 233 changed files with 114,781 additions and 1,764 deletions.
17 changes: 17 additions & 0 deletions .github/auto_assign.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# Set to true to add reviewers to pull requests
addReviewers: true

# Set to true to add assignees to pull requests
addAssignees: true

# A list of reviewers to be added to pull requests (GitHub user name)
reviewers:
- Progi1984

# A list of keywords to be skipped the process that add reviewers if pull requests include it
skipKeywords:
- WIP

# A number of reviewers added to the pull request
# Set 0 to add all the reviewers (default: 0)
numberOfReviewers: 0
18 changes: 9 additions & 9 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@ sudo: false
language: php

php:
- 5.3
- 5.4
- 5.5
- 5.6
- 7.0
- 7.1
- hhvm
- 7.2
- 7.3

matrix:
allow_failures:
- php: 7.1
- php: hhvm
include:
- php: 5.4
dist: trusty
- php: 5.5
dist: trusty

env:
global:
Expand Down Expand Up @@ -46,11 +46,11 @@ script:
## PHPLOC
- ./vendor/bin/phploc src/
## PHPDocumentor
- ./vendor/bin/phpdoc -q -d ./src -t ./build/docs --template="responsive-twig"
# - ./vendor/bin/phpdoc -q -d ./src -t ./build/docs --template="responsive-twig"

after_script:
## PHPDocumentor
- bash .travis_shell_after_success.sh
# - bash .travis_shell_after_success.sh
## Scrutinizer
- wget https://scrutinizer-ci.com/ocular.phar
- php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml
Expand Down
40 changes: 30 additions & 10 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,26 @@
# Changelog

## 0.10.0 - WIP

### Bugfix
- PowerPoint2007 : Text is subscripted when set superscript to false - @qmachard GH-360

### Changes
- Dropped support for HHVM - @sunspikes GH-556
- PHP 7.1 is now supported - @Progi1984 GH-355
- PhpOffice\PhpPresentation\Style\Color : Define only the transparency - @Progi1984 GH-370
- PowerPoint2007 Reader : Background Color based on SchemeColor - @Progi1984 GH-397
- PowerPoint2007 Reader : Support for hyperlinks under pictures - @ulziibuyan

### Features
- ODPresentation Writer : Support for the position of Legend - @Progi1984 GH-355
- ODPresentation Writer : Support for DoughnutChart - @Progi1984 GH-355
- PowerPoint2007 Writer : Support for DoughnutChart - @Progi1984 GH-355
- ODPresentation Reader : Support for fill for image - @Progi1984 GH-370
- PowerPoint2007 Reader : Support for fill for image - @Progi1984 GH-370
- ODPresentation Writer : Support for fill for transparent image - @Progi1984 GH-370
- PowerPoint2007 Writer : Support for fill for transparent image - @JewrassicPark GH-370

## 0.9.0 - 2017-07-05

### Bugfix
Expand All @@ -10,7 +31,7 @@

### Features
- PowerPoint2007 Writer : Implemented XSD validation test case according to the ECMA/ISO standard - @k42b3 GH-307
- PowerPoint2007 Writer : Implement visibility for axis - @kw-pr @Progi1984 GH-356
- PowerPoint2007 Writer : Implement visibility for axis - @kw-pr @Progi1984 GH-356
- PowerPoint2007 Writer : Implement gap width in Bar(3D) Charts - @Progi1984 GH-358

## 0.8.0 - 2017-04-03
Expand Down Expand Up @@ -71,16 +92,16 @@
- ODPresentation & PowerPoint2007 Writer : Add Font Support For Chart Axis - @jrking4 GH-186
- ODPresentation & PowerPoint2007 Writer : Support for video - @Progi1984 GH-123
- ODPresentation & PowerPoint2007 Writer : Support for Visibility for slides - @Progi1984
- PowerPoint2007 Reader : Layout Management - @vincentKool @Progi1984 GH-161
- PowerPoint2007 Reader : Slide size - @loverslcn @Progi1984 GH-246
- PowerPoint2007 Reader : Bullet Color - @Progi1984 GH-257
- PowerPoint2007 Reader : Line Spacing - @Progi1984 GH-257
- PowerPoint2007 Reader : Layout Management - @vincentKool @Progi1984 GH-161
- PowerPoint2007 Reader : Slide size - @loverslcn @Progi1984 GH-246
- PowerPoint2007 Reader : Bullet Color - @Progi1984 GH-257
- PowerPoint2007 Reader : Line Spacing - @Progi1984 GH-257
- PowerPoint2007 Writer : Presentation with predefined View Type - @Progi1984 GH-120
- PowerPoint2007 Writer : Implement alpha channel to Fills - @Dayjo GH-203 / @Progi1984 GH-215
- PowerPoint2007 Writer : Implement Animations - @JewrassicPark GH-214 / @Progi1984 GH-217
- PowerPoint2007 Writer : Layout Management - @vincentKool @Progi1984 GH-161
- PowerPoint2007 Writer : Bullet Color - @piotrbelina GH-249
- PowerPoint2007 Writer : Line Spacing - @piotrbelina GH-249
- PowerPoint2007 Writer : Bullet Color - @piotrbelina GH-249
- PowerPoint2007 Writer : Line Spacing - @piotrbelina GH-249

## 0.6.0 - 2016-01-24

Expand Down Expand Up @@ -156,7 +177,7 @@
- PowerPoint2007 Writer : Hyperlink in table doesn't work - @Progi1984 GH-70
- PowerPoint2007 Writer : AutoFitNormal works with options (fontScale & lineSpacingReduction) - @Progi1984 @desigennaro GH-71
- PowerPoint2007 Writer : Shadow don't work for RichTextShapes - @Progi1984 GH-81
- PowerPoint2007 Writer : Visibility of the Title doesn't work - @Progi1984 GH-107
- PowerPoint2007 Writer : Visibility of the Title doesn't work - @Progi1984 GH-107
- Refactor findLayoutIndex to findLayoutId where it assumes the slideLayout order was sorted. IMPROVED: unit tests - @kenliau GH-95

### Miscellaneous
Expand Down Expand Up @@ -230,15 +251,14 @@
- PowerPoint2007 Writer: Scatter chart with numerical X values not working well - @Progi1984 GH-3
- Shape RichText: Support of Vertical Alignment in PowerPoint2007 - @Progi1984 GH-35


### Miscellaneous

- Rename PHPPowerpoint.php to PHPPowerPoint.php - @maartenba CP-1165
- Create build script using Phing - @maartenba CP-5270
- QA: Prepare `.travis.yml` and `phpcs.xml` for Travis build passing - @Progi1984 @ivanlanin
- QA: Initiate unit tests - @Progi1984 @ivanlanin
- QA: Cleanup source code for PSR dan PHPDoc compatibility - @ivanlanin
- QA: Unit Tests - @Progi1984 & @ivanlanin
- QA: Unit Tests - @Progi1984 & @ivanlanin
- Doc: Initiate documentation - @ivanlanin
- Doc: Move to [Read The Docs](http://phppowerpoint.readthedocs.org) - @Progi1984
- Refactor: Change PHPPowerPoint_Shape_Shadow to PHPPowerPoint_Style_Shadow because it's a style, not a shape - @ivanlanin
Expand Down
Loading

0 comments on commit 30b8ab9

Please sign in to comment.