Merge pull request #84 from legoktm/21x

Remove MediaWiki registration and release 2.2
wmde · Aug 9, 2017 · 19bfff0 · 19bfff0
2 parents f4f4da8 + 85f5bea
commit 19bfff0
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 34 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,8 @@
+.gitattributes export-ignore
+.gitignore export-ignore
+.scrutinizer.yml export-ignore
+.travis.yml export-ignore
+composer.json export-ignore
+phpcs.xml export-ignore
+phpunit.xml.dist export-ignore
+tests export-ignore
diff --git a/Diff.mw.php b/Diff.mw.php
diff --git a/Diff.php b/Diff.php
@@ -5,13 +5,7 @@
 	return 1;
 }
 
-define( 'Diff_VERSION', '2.1' );
-
-if ( defined( 'MEDIAWIKI' ) ) {
-	call_user_func( function() {
-		require_once __DIR__ . '/Diff.mw.php';
-	} );
-}
+define( 'Diff_VERSION', '2.2' );
 
 // Aliasing of classes that got renamed.
 // For more details, see Aliases.php.

diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
@@ -3,6 +3,11 @@ These are the release notes for the [Diff library](README.md).
 Latest release:
 [![Latest Stable Version](https://poser.pugx.org/diff/diff/version.png)](https://packagist.org/packages/diff/diff)
 
+## Version 2.2 (2017-08-09)
+
+* Removed MediaWiki extension registration
+* Add .gitattributes file to exclude not needed files from git exports
+
 ## Version 2.1 (2016-09-01)
 
 * Improved various PHPDocs