fix phpdoc

we need to stop it using "jms/serializer" 1.8.0 or later, there's an
issue with paths

add a "1" to the end of some autogenerated enum names to stop phpdoc
falling over

Author: jcupitt

Diff for: composer.json

@@ -22,6 +22,7 @@
         "psr/log": "^1.0.2"
     },
     "require-dev": {
+        "jms/serializer" : ">=0.12 < 1.8.0",
         "phpunit/phpunit": "^6.5",
         "phpdocumentor/phpdocumentor" : "^2.9",
         "jakub-onderka/php-parallel-lint": "^1.0.0",

Diff for: examples/generate_phpdoc.py

@@ -61,6 +61,14 @@
 # for VipsOperationFlags
 _OPERATION_DEPRECATED = 8
 
+# some names we might generate are reserved PHP names ... just append a "1".
+reserved_php_names = {
+    'DEFAULT': 'DEFAULT1',
+    'XOR': 'XOR1',
+    'AND': 'AND1',
+    'OR': 'OR1'
+}
+
 
 def gtype_to_php(gtype, result=False):
     """Map a gtype to PHP type name we use to represent it.
@@ -322,6 +330,8 @@ def add_enum(gtype, a, b):
 
             for value in values_for_enum(gtype):
                 php_name = value.replace('-', '_').upper()
+                if php_name in reserved_php_names:
+                    php_name = reserved_php_names[php_name]
                 f.write('    const {0} = \'{1}\';\n'.format(php_name, value))
 
             f.write('}\n')

Diff for: src/BlendMode.php

@@ -60,7 +60,7 @@ abstract class BlendMode
     const DEST_IN = 'dest-in';
     const DEST_OUT = 'dest-out';
     const DEST_ATOP = 'dest-atop';
-    const XOR = 'xor';
+    const XOR1 = 'xor';
     const ADD = 'add';
     const SATURATE = 'saturate';
     const MULTIPLY = 'multiply';

Diff for: src/ForeignWebpPreset.php

@@ -49,7 +49,7 @@
  */
 abstract class ForeignWebpPreset
 {
-    const DEFAULT = 'default';
+    const DEFAULT1 = 'default';
     const PICTURE = 'picture';
     const PHOTO = 'photo';
     const DRAWING = 'drawing';

Diff for: src/Image.php

@@ -558,7 +558,7 @@ class Image extends ImageAutodoc implements \ArrayAccess
         BlendMode::DEST_IN => 8,
         BlendMode::DEST_OUT => 9,
         BlendMode::DEST_ATOP => 10,
-        BlendMode::XOR => 11,
+        BlendMode::XOR1 => 11,
         BlendMode::ADD => 12,
         BlendMode::SATURATE => 13,
         BlendMode::MULTIPLY => 14,

Diff for: src/OperationBoolean.php

@@ -49,8 +49,8 @@
  */
 abstract class OperationBoolean
 {
-    const AND = 'and';
-    const OR = 'or';
+    const AND1 = 'and';
+    const OR1 = 'or';
     const EOR = 'eor';
     const LSHIFT = 'lshift';
     const RSHIFT = 'rshift';