Skip to content

Commit 685661f

Browse files
committed
Prepare version 2.9.1-alpha.3.
1 parent d93a521 commit 685661f

File tree

12 files changed

+200
-52
lines changed

12 files changed

+200
-52
lines changed

README.md

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ in your `PATH` variable.
4141
## Versioning
4242

4343
To easier version identification the version of `php-metadata-extractor` will always be aligned with the version
44-
of the Java `metadata-extractor`.
44+
of the Java `metadata-extractor` library.
4545

4646
Stable versions of `php-metadata-extrator` will be equal to `X.Y.Z-N` where `N` represents a patch number
4747
associated to `php-metadata-extractor`.
@@ -82,11 +82,28 @@ The following builds are available :
8282
* `grunt pdepend` generate the PDepend quality charts ;
8383
* `grunt phpmd` generate the PHPMD code quality reports.
8484

85+
## Release history
86+
87+
### 2.9.1-alpha.3 (2016-08-25)
88+
* Add `\Gomoob\MetadataExtractor\Metadata\Bmp\BmpHeaderDescriptor` to begin management of BMP files ;
89+
* Add `\Gomoob\MetadataExtractor\Metadata\Bmp\BmpHeaderDirectory` to begin management of BMP files ;
90+
* Update composer dependencies and improve composer configuration.
91+
92+
### 2.9.1-alpha.2 (2016-08-10)
93+
* Implement the `\Gomoob\MetadataExtractor\Metadata\Directory#containsTag($tagType)` method ;
94+
* Fix unit tests on Travis ;
95+
* Add contribution instructions in the README file.
96+
97+
### 2.9.1-alpha.1 (2016-08-09)
98+
* Initial version.
99+
85100
## About Gomoob
86101

87-
At [Gomoob](https://www.gomoob.com "Gomoob") we build high quality software with awesome Open Source frameworks
88-
everyday. Would you like to start your next project with us? That's great! Give us a call or send us an email and we
89-
will get back to you as soon as possible !
102+
At [Gomoob](https://www.gomoob.com) we build high quality software with awesome Open Source frameworks everyday. Would
103+
you like to start your next project with us? That's great! Give us a call or send us an email and we will get back to
104+
you as soon as possible !
90105

91106
You can contact us by email at [[email protected]](mailto:[email protected]) or by phone number
92107
[(+33) 6 85 12 81 26](tel:+33685128126) or [(+33) 6 28 35 04 49](tel:+33685128126).
108+
109+
Visit also http://gomoob.github.io to discover more Open Source softwares we develop.

composer.json

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name" : "gomoob/php-metadata-extractor",
33
"description" : "PHP wrapper to easily call the Java metadata-extrator library.",
4-
"version" : "2.9.1-alpha.2",
4+
"version" : "2.9.1-alpha.3",
55
"license" : "MIT",
66
"type" : "library",
77
"keywords" : [
@@ -36,18 +36,18 @@
3636
},
3737
"require" : {
3838
"php" : "^5.6 || ^7.0",
39-
"alchemy/binary-driver" : "~1.6"
39+
"alchemy/binary-driver" : "^1.6.0"
4040
},
4141
"require-dev" : {
42-
"codeclimate/php-test-reporter" : "~0.3",
43-
"pdepend/pdepend" : "~2.2",
44-
"phpdocumentor/phpdocumentor" : "2.*",
45-
"phploc/phploc" : "~3.0",
46-
"phpmd/phpmd" : "~2.4",
47-
"phpunit/phpunit" : "~5.5",
48-
"satooshi/php-coveralls" : "~1.0",
49-
"sebastian/phpcpd" : "~2.0",
50-
"squizlabs/php_codesniffer" : "~2.6",
51-
"symfony/yaml" : "~3.1"
42+
"codeclimate/php-test-reporter" : "^0.3.2",
43+
"pdepend/pdepend" : "^2.2.4",
44+
"phpdocumentor/phpdocumentor" : "^2.9.0",
45+
"phploc/phploc" : "^3.0.1",
46+
"phpmd/phpmd" : "^2.4.3",
47+
"phpunit/phpunit" : "^5.5.3",
48+
"satooshi/php-coveralls" : "^1.0.1",
49+
"sebastian/phpcpd" : "^2.0.4",
50+
"squizlabs/php_codesniffer" : "^2.6.2",
51+
"symfony/yaml" : "^3.1.3"
5252
}
5353
}

composer.lock

Lines changed: 26 additions & 26 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "gomoob-php-metadata-extractor",
3-
"version": "2.9.1-alpha.2",
3+
"version": "2.9.1-alpha.3",
44
"license": "MIT",
55
"repository" : {
66
"type" : "git",

src/main/php/Gomoob/MetadataExtractor/Imaging/ImageMetadataReader.php

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,14 @@
1010

1111
use Gomoob\BinaryDriver\MetadataExtractorDriver;
1212

13+
use Gomoob\MetadataExtractor\Lang\Rational;
14+
1315
use Gomoob\MetadataExtractor\Metadata\Metadata;
1416

1517
use Gomoob\MetadataExtractor\Metadata\Directory;
18+
use Gomoob\MetadataExtractor\Metadata\Bmp\BmpHeaderDirectory;
1619
use Gomoob\MetadataExtractor\Metadata\File\FileMetadataDirectory;
20+
use Gomoob\MetadataExtractor\Metadata\Gif\GifHeaderDirectory;
1721
use Gomoob\MetadataExtractor\Metadata\Jpeg\JpegComponent;
1822
use Gomoob\MetadataExtractor\Metadata\Jpeg\JpegDirectory;
1923
use Gomoob\MetadataExtractor\Metadata\Jfif\JfifDirectory;
@@ -30,9 +34,7 @@
3034
use Gomoob\MetadataExtractor\Metadata\Exif\ExifInteropDirectory;
3135
use Gomoob\MetadataExtractor\Metadata\Exif\Makernotes\CanonMakernoteDirectory;
3236
use Gomoob\MetadataExtractor\Metadata\Exif\GpsDirectory;
33-
use Gomoob\MetadataExtractor\Lang\Rational;
3437
use Gomoob\MetadataExtractor\Metadata\Png\PngDirectory;
35-
use Gomoob\MetadataExtractor\Metadata\Gif\GifHeaderDirectory;
3638

3739
/**
3840
* Reads metadata from any supported file format.
@@ -677,6 +679,9 @@ private static function createDirectoryWithName($directoryName)
677679
case 'Adobe JPEG':
678680
$directory = new AdobeJpegDirectory();
679681
break;
682+
case 'BMP Header':
683+
$directory = new BmpHeaderDirectory();
684+
break;
680685
case 'Canon Makernote':
681686
$directory = new CanonMakernoteDirectory();
682687
break;

src/main/php/Gomoob/MetadataExtractor/Metadata/Adobe/AdobeJpegDescriptor.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
/**
44
* gomoob/php-metadata-extractor
5-
*
6-
* @copyright Copyright (c) 2016, GOMOOB SARL (http://gomoob.com)
7-
* @license http://www.opensource.org/licenses/mit-license.php MIT (see the LICENSE.md file)
8-
*/
5+
*
6+
* @copyright Copyright (c) 2016, GOMOOB SARL (http://gomoob.com)
7+
* @license http://www.opensource.org/licenses/mit-license.php MIT (see the LICENSE.md file)
8+
*/
99
namespace Gomoob\MetadataExtractor\Metadata\Adobe;
1010

1111
use Gomoob\MetadataExtractor\Metadata\TagDescriptor;
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?php
2+
3+
/**
4+
* gomoob/php-metadata-extractor
5+
*
6+
* @copyright Copyright (c) 2016, GOMOOB SARL (http://gomoob.com)
7+
* @license http://www.opensource.org/licenses/mit-license.php MIT (see the LICENSE.md file)
8+
*/
9+
namespace Gomoob\MetadataExtractor\Metadata\Bmp;
10+
11+
use Gomoob\MetadataExtractor\Metadata\TagDescriptor;
12+
13+
/**
14+
* @author Baptiste GAILLARD ([email protected])
15+
*/
16+
class BmpHeaderDescriptor extends TagDescriptor
17+
{
18+
public function __construct(BmpHeaderDirectory $directory)
19+
{
20+
parent::__construct($directory);
21+
}
22+
}
Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
<?php
2+
3+
/**
4+
* gomoob/php-metadata-extractor
5+
*
6+
* @copyright Copyright (c) 2016, GOMOOB SARL (http://gomoob.com)
7+
* @license http://www.opensource.org/licenses/mit-license.php MIT (see the LICENSE.md file)
8+
*/
9+
namespace Gomoob\MetadataExtractor\Metadata\Bmp;
10+
11+
use Gomoob\MetadataExtractor\Metadata\Directory;
12+
13+
/**
14+
* @author Baptiste GAILLARD ([email protected])
15+
*/
16+
class BmpHeaderDirectory extends Directory
17+
{
18+
const TAG_HEADER_SIZE = -1;
19+
20+
const TAG_IMAGE_HEIGHT = 1;
21+
const TAG_IMAGE_WIDTH = 2;
22+
const TAG_COLOUR_PLANES = 3;
23+
const TAG_BITS_PER_PIXEL = 4;
24+
const TAG_COMPRESSION = 5;
25+
const TAG_X_PIXELS_PER_METER = 6;
26+
const TAG_Y_PIXELS_PER_METER = 7;
27+
const TAG_PALETTE_COLOUR_COUNT = 8;
28+
const TAG_IMPORTANT_COLOUR_COUNT = 9;
29+
30+
private static $tagNameMap = [
31+
self::TAG_HEADER_SIZE => 'Header Size',
32+
33+
self::TAG_IMAGE_HEIGHT => 'Image Height',
34+
self::TAG_IMAGE_WIDTH => 'Image Width',
35+
self::TAG_COLOUR_PLANES => 'Planes',
36+
self::TAG_BITS_PER_PIXEL => 'Bits Per Pixel',
37+
self::TAG_COMPRESSION => 'Compression',
38+
self::TAG_X_PIXELS_PER_METER => 'X Pixels per Meter',
39+
self::TAG_Y_PIXELS_PER_METER => 'Y Pixels per Meter',
40+
self::TAG_PALETTE_COLOUR_COUNT => 'Palette Colour Count',
41+
self::TAG_IMPORTANT_COLOUR_COUNT => 'Important Colour Count'
42+
];
43+
44+
public function __construct()
45+
{
46+
$this->setDescriptor(new BmpHeaderDescriptor($this));
47+
}
48+
49+
/**
50+
* {@inheritDoc}
51+
*/
52+
public function getName()
53+
{
54+
return 'BMP Header';
55+
}
56+
57+
/**
58+
* {@inheritDoc}
59+
*/
60+
protected function getTagNameMap()
61+
{
62+
return static::$tagNameMap;
63+
}
64+
}

src/test/php/Gomoob/BinaryDriver/MetadataExtractorDriverTest.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
*/
1717
class MetadataExtractorDriverTest extends TestCase
1818
{
19-
2019
/**
2120
* Test method for `create($logger, $configuration)`.
2221
*/

src/test/php/Gomoob/MetadataExtractor/Imaging/ImageMetadataReader/Dotnet256x256AlphaPaletteTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
use Gomoob\MetadataExtractor\Metadata\File\FileMetadataDirectory;
1414

1515
/**
16-
* Test case used to test the {@link ImageMetadataReader} class with the `Nikon E990.jpg` test file.
16+
* Test case used to test the {@link ImageMetadataReader} class with the `dotnet-256x256-alpha-palette.png` test file.
1717
*
1818
* @author Baptiste GAILLARD ([email protected])
1919
* @group ImageMetadataReader.Dotnet256x256AlphaPaletteTest

0 commit comments

Comments
 (0)