Skip to content

Commit 015a34f

Browse files
author
Roman Syroeshko
committed
Added backward compatibility for deprecated alignment options.
1 parent 3965f11 commit 015a34f

File tree

4 files changed

+10
-36
lines changed

4 files changed

+10
-36
lines changed

.travis.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@ before_script:
3131
script:
3232
## PHP_CodeSniffer
3333
- ./vendor/bin/phpcs src/ tests/ --standard=PSR2 -n --ignore=src/PhpWord/Shared/PCLZip
34-
## PHP Copy/Paste Detector
35-
- ./vendor/bin/phpcpd src/ tests/ --verbose
3634
## PHP Mess Detector
3735
- ./vendor/bin/phpmd src/,tests/ text ./phpmd.xml.dist --exclude pclzip.lib.php
3836
## PHPUnit

CHANGELOG.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,17 @@ Place announcement text here.
1616
### Changed
1717
- Improved error message for the case when `autoload.php` is not found. - @RomanSyroeshko #371
1818
- Renamed the `align` option of `NumberingLevel`, `Frame`, `Table`, and `Paragraph` styles into `alignment`. - @RomanSyroeshko
19-
- Bootstrap script for the manual installation scenario (now include `bootstrap.php` instead of `src/PhpWord/Autoloader.php`). - @RomanSyroeshko
2019

2120
### Deprecated
2221
- `getAlign` and `setAlign` methods of `NumberingLevel`, `Frame`, `Table`, and `Paragraph` styles.
23-
Use the correspondent `getAlignment` and `setAlignment` methods instead.
24-
- `left`, `right`, and `justify` alignment options for paragraphs (now are mapped to `Jc::START`, `Jc::END`, and `Jc::BOTH`).
25-
- `left`, `right`, and `justify` alignment options for tables (now are mapped to `Jc::START`, `Jc::END`, and `Jc::CENTER`).
22+
Use the correspondent `getAlignment` and `setAlignment` methods instead. - @RomanSyroeshko
23+
- `left`, `right`, and `justify` alignment options for paragraphs (now are mapped to `Jc::START`, `Jc::END`, and `Jc::BOTH`). - @RomanSyroeshko
24+
- `left`, `right`, and `justify` alignment options for tables (now are mapped to `Jc::START`, `Jc::END`, and `Jc::CENTER`). - @RomanSyroeshko
2625

2726
### Removed
2827
- `PhpOffice\PhpWord\Style\Alignment`. Style properties, which previously stored instances of this class, now deal with strings.
29-
In each case set of available string values is defined by the correspondent simple type.
28+
In each case set of available string values is defined by the correspondent simple type. - @RomanSyroeshko
29+
- Manual installation option. To install PHPWord use Composer since now. - @RomanSyroeshko
3030

3131

3232
0.12.1 (30 August 2015)

composer.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
"phpdocumentor/phpdocumentor":"2.*",
4242
"squizlabs/php_codesniffer": "1.*",
4343
"phpmd/phpmd": "2.*",
44-
"sebastian/phpcpd": "2.*",
4544
"phploc/phploc": "2.*",
4645
"dompdf/dompdf":"0.6.*",
4746
"tecnick.com/tcpdf": "6.*",

docs/installing.rst

Lines changed: 5 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -21,25 +21,22 @@ Optional PHP extensions:
2121
Installation
2222
------------
2323

24-
There are two ways to install PHPWord, i.e. via
25-
`Composer <http://getcomposer.org/>`__ or manually by downloading the library.
26-
27-
Using Composer
28-
~~~~~~~~~~~~~~
29-
30-
To install via Composer, add the following lines to your ``composer.json``:
24+
PHPWord is installed via `Composer <https://getcomposer.org/>`__.
25+
You just need to `add dependency <https://getcomposer.org/doc/04-schema.md#package-links>`__ on PHPWord into your package.
3126

27+
Example:
3228
.. code-block:: json
3329
3430
{
3531
"require": {
36-
"phpoffice/phpword": "dev-master"
32+
"phpoffice/phpword": "v0.13.*"
3733
}
3834
}
3935
4036
If you are a developer or if you want to help us with testing then fetch the latest branch for developers.
4137
Notice: all contributions must be done against the developer branch.
4238

39+
Example:
4340
.. code-block:: json
4441
4542
{
@@ -49,26 +46,6 @@ Notice: all contributions must be done against the developer branch.
4946
}
5047
5148
52-
Manual installation
53-
~~~~~~~~~~~~~~~~~~~
54-
55-
To install manually, you change to the web-server directory of your file system. Then you have 2 possibilities.
56-
57-
1. `download PHPWord package from github <https://github.com/PHPOffice/PHPWord/archive/master.zip>`__.
58-
Extract the package and put the contents to your machine.
59-
2. Alternatively you can use Git to install it:
60-
.. code-block:: console
61-
62-
git clone https://github.com/PHPOffice/PHPWord.git
63-
64-
To use the library, include ``bootstrap.php`` in your PHP script and invoke ``Autoloader::register``.
65-
66-
.. code-block:: php
67-
68-
require_once "${path_to_the_cloned_repo}/bootstrap.php";
69-
\PhpOffice\PhpWord\Autoloader::register();
70-
71-
7249
Using samples
7350
-------------
7451

0 commit comments

Comments
 (0)