Skip to content

Commit b346a4a

Browse files
committed
Merge branch 'develop' of https://github.com/PHPOffice/PHPPowerPoint into develop
2 parents 11c9074 + 2274275 commit b346a4a

File tree

3 files changed

+5
-1
lines changed

3 files changed

+5
-1
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
### Features
66
- PowerPoint97 Reader : Implement Basic Reader - @Progi1984 GH-15 GH-14 GH-4
77
- ODPresentation Writer : Ability to set auto shrink text - @Progi1984 GH-28
8+
- Make package PSR-4 compliant. Autoload classes by composer out of the box - @Djuki GH-41
89

910
### Bugfix
1011
- PowerPoint2007 Writer : Powerpoint Repair Error in Office 2010 - @Progi1984 GH-39

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ the following lines to your ``composer.json``.
5959
```
6060

6161
Alternatively, you can download the latest release from the [releases page](https://github.com/PHPOffice/PHPPowerPoint/releases).
62-
In this case, you will have to register the autoloader.
62+
In this case, you will have to register the autoloader. Register autoloading is required only if you do not use composer in your project.
6363

6464
```php
6565
require_once 'path/to/PhpPowerpoint/src/PhpPowerpoint/Autoloader.php';

composer.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@
3838
"autoload": {
3939
"psr-0": {
4040
"PHPPowerPoint": "src/"
41+
},
42+
"psr-4": {
43+
"PhpOffice\\PhpPowerpoint\\": "src/PhpPowerpoint/"
4144
}
4245
}
4346
}

0 commit comments

Comments
 (0)