Merge pull request #127 from reedy/reedy-patch-1

Add .gitattributes

Author: moufmouf

.gitattributes

@@ -0,0 +1,8 @@
+/.gitattributes export-ignore
+/.gitignore export-ignore
+/.travis.yml export-ignore
+/CONTRIBUTING.md export-ignore
+/phpcs.xml.dist export-ignore
+/phpstan.neon export-ignore
+/benchmark export-ignore
+/generator export-ignore

.travis.yml

@@ -52,6 +52,10 @@ script:
   else
     # Uncommitted changes
     echo "Generated files are different from commited files. Please run './safe.php generate' command and commit the results."
+    echo "Detected changes:"
+    git status
+    git diff
+    echo "Generated files are different from commited files. Please run './safe.php generate' command and commit the results."
     exit 1;
   fi
 - cd generator/tests/rector/0.4 && composer install && composer rector && composer test && cd ../../../..

generated/com.php

@@ -120,13 +120,7 @@ function com_load_typelib(string $typelib_name, bool $case_sensitive = true): vo
 function com_print_typeinfo(object $comobject, string $dispinterface = null, bool $wantsink = false): void
 {
     error_clear_last();
-    if ($wantsink !== false) {
-        $result = \com_print_typeinfo($comobject, $dispinterface, $wantsink);
-    } elseif ($dispinterface !== null) {
-        $result = \com_print_typeinfo($comobject, $dispinterface);
-    } else {
-        $result = \com_print_typeinfo($comobject);
-    }
+    $result = \com_print_typeinfo($comobject, $dispinterface, $wantsink);
     if ($result === false) {
         throw ComException::createFromPhpError();
     }

generated/filesystem.php

@@ -948,6 +948,38 @@ function fwrite($handle, string $string, int $length = null): int
  * shells.
  *
  * @param string $pattern The pattern. No tilde expansion or parameter substitution is done.
+ *
+ * Special characters:
+ *
+ *
+ *
+ * * - Matches zero of more characters.
+ *
+ *
+ *
+ *
+ * ? - Matches exactly one character (any character).
+ *
+ *
+ *
+ *
+ * [...] - Matches one character from a group of
+ * characters. If the first character is !,
+ * matches any character not in the group.
+ *
+ *
+ *
+ *
+ * ... - Matches all the subdirectories, recursively.
+ *
+ *
+ *
+ *
+ * \ - Escapes the following character,
+ * except when the GLOB_NOESCAPE flag is used.
+ *
+ *
+ *
  * @param int $flags Valid flags:
  *
  *

generated/network.php

@@ -56,8 +56,10 @@ function closelog(): void
  * Records for the Authoritative Name Servers.
  * @param array $addtl Passed by reference and, if given, will be populated with any
  * Additional Records.
- * @param bool $raw In case of raw mode, we query only the requested type instead of looping
- * type by type before going with the additional info stuff.
+ * @param bool $raw The type will be interpreted as a raw DNS type ID
+ * (the DNS_* constants cannot be used).
+ * The return value will contain a data key, which needs
+ * to be manually parsed.
  * @return array This function returns an array of associative arrays. Each associative array contains
  * at minimum the following keys:
  *

generated/sockets.php

@@ -789,7 +789,7 @@ function socket_write($socket, string $buffer, int $length = 0): int
  * exported ID is only valid for the given target_pid.
  *
  * @param resource  $socket A valid socket resource.
- * @param int  $target_pid The ID of the process which will import the the socket.
+ * @param int  $target_pid The ID of the process which will import the socket.
  * @return string Returns an identifier to be used for the import
  * @throws SocketsException
  *

generated/yaml.php

@@ -23,7 +23,7 @@
  * @throws YamlException
  *
  */
-function yaml_parse_file(string $filename, int $pos = 0, int &$ndocs = null, array $callbacks = null)
+function yaml_parse_file(string $filename, int $pos = 0, ?int &$ndocs = null, array $callbacks = null)
 {
     error_clear_last();
     $result = \yaml_parse_file($filename, $pos, $ndocs, $callbacks);