diff --git a/.gitignore b/.gitignore
index cc4de17..e739e46 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,26 @@
 .jsdtscope
 org.eclipse.*
 
+# PHPStorm files #
+#################
+.idea
+.idea/*
+
+# NetBeans files #
+##################
+nbproject
+nbproject/*
+nbproject/private/
+nbproject/private/*
+
+# Composer files #
+#################
+vendor
+vendor/*
+*.lock
+/tests/*.lock
+/*.phar
+
 # Compiled source #
 ###################
 *.com
@@ -34,14 +54,31 @@ org.eclipse.*
 *.sql
 *.sqlite
 
-# OS generated files #
-######################
-.DS_Store?
+# Windows and OS generated files #
+##################################
+.DS_Store
 ehthumbs.db
 Icon?
 Thumbs.db
+Desktop.ini
+$RECYCLE.BIN/
 
-.DS_Store
-nbproject/private/
-nbproject
-demo/georgia-pls-ssml/
\ No newline at end of file
+# Test generated files #
+########################
+tests/screenshots/*
+tests/*.lock
+tests/*.phar
+tests/*.bat
+tests/*.epub
+tests/vendor
+tests/vendor/*
+tests/demo/georgia-pls-ssml
+tests/georgia-pls-ssml/*
+tests/tools
+tests/tools/*
+legacy/*.lock
+legacy/vendor
+legacy/vendor/*
+
+testData
+testData/*
\ No newline at end of file