Skip to content

Commit 76ef8f3

Browse files
committed
Merge remote-tracking branch 'upstream/develop' into issue161
2 parents cbc8718 + 136bd35 commit 76ef8f3

File tree

2 files changed

+18
-2
lines changed

2 files changed

+18
-2
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
- PhpOffice\PhpPresentation\Shape\Type\AbstracType\setData has been deprecated for PhpOffice\PhpPresentation\Shape\Type\AbstracType\setSeries - @Progi1984 GH-169
1414
- Added documentation for chart series (font, outline, marker) - @Progi1984 GH-169
1515
- Internal Structure for Drawing Shape - @Progi1984 GH-192
16+
- Documentation about manual installation - @danielbair GH-254
1617

1718
### Features
1819
- ODPresentation & PowerPoint2007 Writer : Add support for Comment - @Progi1984 GH-116

README.md

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ PHPPresentation requires the following:
4848

4949
### Installation
5050

51+
#### Composer method
52+
5153
It is recommended that you install the PHPPresentation library [through composer](http://getcomposer.org/). To do so, add
5254
the following lines to your ``composer.json``.
5355

@@ -59,14 +61,25 @@ the following lines to your ``composer.json``.
5961
}
6062
```
6163

62-
Alternatively, you can download the latest release from the [releases page](https://github.com/PHPOffice/PHPPresentation/releases).
63-
In this case, you will have to register the autoloader. Register autoloading is required only if you do not use composer in your project.
64+
#### Manual download method
65+
66+
Alternatively, you can download the latest release from the [releases page](https://github.com/PHPOffice/PHPPresentation/releases).
67+
In this case, you will have to register the autoloader.
68+
(Register autoloading is required only if you do not use composer in your project.)
6469

6570
```php
6671
require_once 'path/to/PhpPresentation/src/PhpPresentation/Autoloader.php';
6772
\PhpOffice\PhpPresentation\Autoloader::register();
6873
```
6974

75+
You will also need to download the latest PHPOffice/Common release from its [releases page](https://github.com/PHPOffice/Common/releases).
76+
And you will also have to register its autoloader, too.
77+
78+
```php
79+
require_once 'path/to/PhpOffice/Common/src/Common/Autoloader.php';
80+
\PhpOffice\Common\Autoloader::register();
81+
```
82+
7083
## Getting started
7184

7285
The following is a basic usage example of the PHPPresentation library.
@@ -75,6 +88,8 @@ The following is a basic usage example of the PHPPresentation library.
7588
// with your own install
7689
require_once 'src/PhpPresentation/Autoloader.php';
7790
\PhpOffice\PhpPresentation\Autoloader::register();
91+
require_once 'src/Common/Autoloader.php';
92+
\PhpOffice\Common\Autoloader::register();
7893

7994
// with Composer
8095
require_once 'vendor/autoload.php';

0 commit comments

Comments
 (0)