From af8ea2c26624203fffc6327b33b8fea6dbbb216b Mon Sep 17 00:00:00 2001 From: Ivan Lanin Date: Wed, 26 Mar 2014 18:05:56 +0700 Subject: [PATCH 1/4] Update README.md Change link to RTD. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5e319d33..9c02f876 100755 --- a/README.md +++ b/README.md @@ -101,4 +101,4 @@ $objWriter->save('helloWorld.rtf'); __Want to contribute?__ [Fork us](https://github.com/PHPOffice/PHPWord/fork) or [submit](https://github.com/PHPOffice/PHPWord/issues) your bug reports or feature requests to us. -__Want to know more?__ Read the full documentation of PHPWord on [Read The Docs](http://phpword.readthedocs.org/en/develop/). +__Want to know more?__ Read the full documentation of PHPWord on [Read The Docs](http://phpword.readthedocs.org/). From 0f16da9a56d8a7207d845cb3ad3c98ce290fdc76 Mon Sep 17 00:00:00 2001 From: Anton Tyutin Date: Thu, 27 Mar 2014 10:04:34 +0300 Subject: [PATCH 2/4] Fix psr-4 base dir in composer.json --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 1559ad7b..fcca56e7 100644 --- a/composer.json +++ b/composer.json @@ -42,7 +42,7 @@ }, "autoload": { "psr-4": { - "PhpOffice\\PhpWord\\": "src/" + "PhpOffice\\PhpWord\\": "src/PhpWord" } } -} \ No newline at end of file +} From 75a672956520440177f50d0d4082dad93ffa5508 Mon Sep 17 00:00:00 2001 From: Gabriel Bull Date: Thu, 27 Mar 2014 07:38:24 -0400 Subject: [PATCH 3/4] Updated change log --- CHANGELOG.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 867bb2aa..3bb699ea 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,13 @@ This is the changelog between releases of PHPWord. Releases are listed in reverse chronological order with the latest version listed on top, while additions/changes in each release are listed in chronological order. Changes in each release are divided into three parts: added or change features, bugfixes, and miscellaneous improvements. Each line contains short information about the change made, the person who made it, and the related issue number(s) in GitHub. -## 0.9.0 - Not yet released +## 0.9.1 - 27 Mar 2014 + +This is a bugfix release for PSR-4 compatibility. + +- Fixed PSR-4 composer autoloader - @AntonTyutin + +## 0.9.0 - 26 Mar 2014 This release marked the transformation to namespaces (PHP 5.3+). From c6fc1d4e892b217d781bbc9ad194d9d0d0b05d84 Mon Sep 17 00:00:00 2001 From: Gabriel Bull Date: Thu, 27 Mar 2014 07:52:22 -0400 Subject: [PATCH 4/4] Moved the autoloader in the basic usage to the installation section in the read me --- README.md | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 9c02f876..8d5370eb 100755 --- a/README.md +++ b/README.md @@ -29,6 +29,8 @@ With PHPWord, you can create DOCX, ODT, or RTF documents dynamically using your * Use XSL 1.0 style sheets to transform main document part of OOXML template * ... and many more features on progress +__Want to contribute?__ [Fork us](https://github.com/PHPOffice/PHPWord/fork) or [submit](https://github.com/PHPOffice/PHPWord/issues) your bug reports or feature requests to us. + ## Requirements * PHP 5.3+ * PHP [Zip](http://php.net/manual/en/book.zip.php) extension @@ -52,14 +54,19 @@ the following lines to your ``composer.json``. } ``` +Alternatively, you can download the latest release from the [releases page](https://github.com/PHPOffice/PHPWord/releases). +In this case, you will have to register the autoloader. + +```php +require_once 'path/to/PhpWord/src/PhpWord/Autoloader.php'; +PhpOffice\PhpWord\Autoloader::register(); +``` + ## Basic usage The following is a basic example of the PHPWord library. More examples are provided in the [samples folder](samples/). ```php -require_once 'src/PhpWord/Autoloader.php'; -PhpOffice\PhpWord\Autoloader::register(); - $phpWord = new \PhpOffice\PhpWord\PhpWord(); // Every element you want to append to the word document is placed in a section. @@ -99,6 +106,6 @@ $objWriter = \PhpOffice\PhpWord\IOFactory::createWriter($phpWord, 'RTF'); $objWriter->save('helloWorld.rtf'); ``` -__Want to contribute?__ [Fork us](https://github.com/PHPOffice/PHPWord/fork) or [submit](https://github.com/PHPOffice/PHPWord/issues) your bug reports or feature requests to us. +## Documentation __Want to know more?__ Read the full documentation of PHPWord on [Read The Docs](http://phpword.readthedocs.org/).