Merge remote-tracking branch 'upstream/develop' into simplified-docblock

This commit is contained in:
Ivan Lanin 2014-03-27 23:17:47 +07:00
commit f6ca40392f
3 changed files with 21 additions and 8 deletions

View File

@ -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. 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+). This release marked the transformation to namespaces (PHP 5.3+).

View File

@ -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 * Use XSL 1.0 style sheets to transform main document part of OOXML template
* ... and many more features on progress * ... 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 ## Requirements
* PHP 5.3+ * PHP 5.3+
* PHP [Zip](http://php.net/manual/en/book.zip.php) extension * 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 ## Basic usage
The following is a basic example of the PHPWord library. More examples are provided in the [samples folder](samples/). The following is a basic example of the PHPWord library. More examples are provided in the [samples folder](samples/).
```php ```php
require_once 'src/PhpWord/Autoloader.php';
PhpOffice\PhpWord\Autoloader::register();
$phpWord = new \PhpOffice\PhpWord\PhpWord(); $phpWord = new \PhpOffice\PhpWord\PhpWord();
// Every element you want to append to the word document is placed in a section. // 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'); $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/en/develop/). __Want to know more?__ Read the full documentation of PHPWord on [Read The Docs](http://phpword.readthedocs.org/).

View File

@ -42,7 +42,7 @@
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {
"PhpOffice\\PhpWord\\": "src/" "PhpOffice\\PhpWord\\": "src/PhpWord"
} }
} }
} }