Skip to content

Commit 99f1a7d

Browse files
committed
Merge branch 'develop' into issue179
Conflicts: CHANGELOG.md README.md
2 parents 5c3e874 + 9727408 commit 99f1a7d

File tree

7 files changed

+29
-8
lines changed

7 files changed

+29
-8
lines changed

.codeclimate.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
engines:
2+
phpcodesniffer:
3+
enabled: true
4+
phpmd:
5+
enabled: true
6+
duplication:
7+
enabled: true
8+
config:
9+
languages:
10+
- php
11+
ratings:
12+
paths:
13+
- src/**/*
14+
- tests/**
15+
exclude_paths:
16+
- vendor/**/*

.travis.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ php:
1111

1212
matrix:
1313
allow_failures:
14-
- php: 7.0
1514
- php: hhvm
1615

1716
env:
@@ -22,6 +21,8 @@ addons:
2221
apt:
2322
packages:
2423
- graphviz
24+
code_climate:
25+
repo_token: 9d5714bfd25acc27c449c2d71cfb444351a3b91c59ed1a5dc3a50732d2bf45f0
2526

2627
before_script:
2728
## Composer
@@ -51,6 +52,8 @@ after_script:
5152
## Scrutinizer
5253
- wget https://scrutinizer-ci.com/ocular.phar
5354
- php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml
55+
## CodeClimate
56+
- ./vendor/bin/test-reporter
5457

5558
notifications:
5659
webhooks:

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
## 0.7.0 - WIP
44

55
### Bugfix
6+
- Fixed the image project - @mvargasmoran GH-177
67
- PowerPoint2007 Writer : Bugfix for printing slide notes - @JewrassicPark GH-179
78

89
## 0.6.0 - 2016-01-24

README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
# ![PHPPresentation](https://github.com/PHPOffice/PHPPresentation/raw/master/docs/images/PHPPowerPointLogo.png "PHPPresentation")
1+
# ![PHPPresentation](https://raw.githubusercontent.com/mvargasmoran/PHPPresentation/develop/docs/images/PHPPresentationLogo.png "PHPPresentation")
22

33
[![Latest Stable Version](https://poser.pugx.org/phpoffice/phppresentation/v/stable.png)](https://packagist.org/packages/phpoffice/phppresentation)
44
[![Build Status](https://travis-ci.org/PHPOffice/PHPPresentation.svg?branch=master)](https://travis-ci.org/PHPOffice/PHPPresentation)
5-
[![Code Quality](https://scrutinizer-ci.com/g/PHPOffice/PHPPresentation/badges/quality-score.png?s=b5997ce59ac2816b4514f3a38de9900f6d492c1d)](https://scrutinizer-ci.com/g/PHPOffice/PHPPresentation/)
6-
[![Code Coverage](https://scrutinizer-ci.com/g/PHPOffice/PHPPresentation/badges/coverage.png?s=742a98745725c562955440edc8d2c39d7ff5ae25)](https://scrutinizer-ci.com/g/PHPOffice/PHPPresentation/)
5+
[![Code Climate](https://codeclimate.com/github/PHPOffice/PHPPresentation/badges/gpa.svg)](https://codeclimate.com/github/PHPOffice/PHPPresentation)
6+
[![Test Coverage](https://codeclimate.com/github/PHPOffice/PHPPresentation/badges/coverage.svg)](https://codeclimate.com/github/PHPOffice/PHPPresentation/coverage)
77
[![Total Downloads](https://poser.pugx.org/phpoffice/phppresentation/downloads.png)](https://packagist.org/packages/phpoffice/phppresentation)
88
[![License](https://poser.pugx.org/phpoffice/phppresentation/license.png)](https://packagist.org/packages/phpoffice/phppresentation)
99
[![Join the chat at https://gitter.im/PHPOffice/PHPPresentation](https://img.shields.io/badge/GITTER-join%20chat-green.svg)](https://gitter.im/PHPOffice/PHPPresentation)
1010

1111

1212
PHPPresentation is a library written in pure PHP that provides a set of classes to write to different presentation file formats, i.e. Microsoft [Office Open XML](http://en.wikipedia.org/wiki/Office_Open_XML) (OOXML or OpenXML) or OASIS [Open Document Format for Office Applications](http://en.wikipedia.org/wiki/OpenDocument) (OpenDocument or ODF).
1313

14-
PHPPresentation is an open source project licensed under the terms of [LGPL version 3](https://github.com/PHPOffice/PHPPresentation/blob/develop/COPYING.LESSER). PHPPresentation is aimed to be a high quality software product by incorporating [continuous integration](https://travis-ci.org/PHPOffice/PHPPresentation) and [unit testing](http://phpoffice.github.io/PHPPresentation/coverage/develop/). You can learn more about PHPPresentation by reading the [Developers' Documentation](http://phppresentation.readthedocs.org) and the [API Documentation](http://phpoffice.github.io/PHPPresentation/docs/develop/).
14+
PHPPresentation is an open source project licensed under the terms of [LGPL version 3](https://github.com/PHPOffice/PHPPresentation/blob/develop/COPYING.LESSER). PHPPresentation is aimed to be a high quality software product by incorporating [continuous integration](https://travis-ci.org/PHPOffice/PHPPresentation) and [unit testing](http://phpoffice.github.io/PHPPresentation/coverage/develop/). You can learn more about PHPPresentation by reading the [Developers' Documentation](http://phppresentation.readthedocs.org/) and the [API Documentation](http://phpoffice.github.io/PHPPresentation/docs/develop/).
1515

1616
Read more about PHPPresentation:
1717

@@ -20,7 +20,7 @@ Read more about PHPPresentation:
2020
- [Installation](#installation)
2121
- [Getting started](#getting-started)
2222
- [Contributing](#contributing)
23-
- [Developers' Documentation](http://phppresentation.readthedocs.org)
23+
- [Developers' Documentation](http://phppresentation.readthedocs.org/)
2424
- [API Documentation](http://phpoffice.github.io/PHPPresentation/docs/master/)
2525

2626
### Features
@@ -119,7 +119,7 @@ $oWriterODP = IOFactory::createWriter($objPHPPowerPoint, 'ODPresentation');
119119
$oWriterODP->save(__DIR__ . "/sample.odp");
120120
```
121121

122-
More examples are provided in the [samples folder](samples/). You can also read the [Developers' Documentation](http://phppresentation.readthedocs.org) and the [API Documentation](http://phpoffice.github.io/PHPPresentation/docs/master/) for more detail.
122+
More examples are provided in the [samples folder](samples/). You can also read the [Developers' Documentation](http://phppresentation.readthedocs.org/) and the [API Documentation](http://phpoffice.github.io/PHPPresentation/docs/master/) for more detail.
123123

124124

125125
## Contributing

composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@
3030
"phpmd/phpmd": "2.*",
3131
"sebastian/phpcpd": "2.*",
3232
"phploc/phploc": "2.*",
33-
"squizlabs/php_codesniffer": "2.*"
33+
"squizlabs/php_codesniffer": "2.*",
34+
"codeclimate/php-test-reporter": "dev-master"
3435
},
3536
"suggest": {
3637
"ext-gd2": "Required to add images"

docs/images/PHPPowerPointLogo.png

-4.74 KB
Binary file not shown.

docs/images/PHPPresentationLogo.png

34.9 KB
Loading

0 commit comments

Comments
 (0)