Merge branch 'release/1.4.1'

.travis.yml

@@ -4,13 +4,19 @@ php:
   - 5.3
   - 5.4
 
+env:
+  - SYMFONY_VERSION='2.0.*'
+  - SYMFONY_VERSION='2.1.*'
+  - SYMFONY_VERSION='2.2.*@dev'
+
 branches:
   only:
     - master
     - develop
 
 before_script:
   - curl http://getcomposer.org/installer | php
-  - php composer.phar install
+  - php composer.phar require --no-update symfony/symfony=$SYMFONY_VERSION
+  - php composer.phar install --dev --prefer-source
 
-script: phpunit
+script: phpunit -v

CHANGES.md

@@ -1,3 +1,14 @@
+1.4.1 / 2013-02-10
+==================
+
+  * Update dependencies
+  * Add ElementException to element actions
+  * Rel attribute support for named selectors
+  * Add hasClass() helper to traversable elements
+  * Add getScreenshot() method to session
+  * Name attr support in named selector for button
+  * Fix for bunch of bugs
+
 1.4.0 / 2012-05-40
 ==================
 

bin/release

@@ -17,12 +17,8 @@
  * @author     Konstantin Kudryashov <ever.zet@gmail.com>
  */
 
-require_once __DIR__ . '/../vendor/autoload.php';
-
 use Behat\Mink\Compiler;
 
-system('rm *.phar *.tgz');
-
 if (!isset($argv[1])) {
   throw new RuntimeException('You must provide version.');
 }
@@ -33,20 +29,24 @@ if (!isset($argv[2])) {
 }
 $stability = $argv[2];
 
-$ldr = new Compiler\MapFileCompiler($autoloaderFilename = 'autoload.php', $mapFilename = 'autoload_map.php');
-$ldr->compile();
-echo "Autoloader compiled\n";
+system('rm -rf vendor composer.lock');
+system('cp composer.json composer.json.back');
+system('composer require --no-update "behat/mink-goutte-driver=@dev"');
+system('composer require --no-update "behat/mink-sahi-driver=@dev"');
+system('composer require --no-update "behat/mink-selenium-driver=@dev"');
+system('composer require --no-update "behat/mink-selenium2-driver=@dev"');
+system('composer require --no-update "behat/mink-zombie-driver=@dev"');
+system('composer install --prefer-dist');
 
-$pear = new Compiler\PearCompiler();
-$pear->compile($version, $stability);
-echo "PEAR package compiled: mink-$version.tgz\n";
+require_once __DIR__ . '/../vendor/autoload.php';
 
+system('rm *.phar');
 $phar = new Compiler\PharCompiler();
 $phar->compile($version);
 system("cp mink-$version.phar mink.phar");
 echo "PHAR package compiled: mink-$version.phar\n";
 
-unlink($autoloaderFilename);
-unlink($mapFilename);
-
+system('mv composer.json.back composer.json');
+system('rm -rf vendor composer.lock');
+system('composer install --dev --prefer-dist');
 exit(0);

composer.json

@@ -16,16 +16,7 @@
 
     "require": {
         "php":                   ">=5.3.1",
-        "symfony/css-selector":  ">=2.0.0,<2.2.0-dev"
-    },
-
-    "require-dev": {
-        "behat/mink-goutte-driver":     "*",
-        "behat/mink-sahi-driver":       "*",
-        "behat/mink-selenium-driver":   "*",
-        "behat/mink-selenium2-driver":  "*",
-        "behat/mink-zombie-driver":     "*",
-        "symfony/finder":               ">=2.0.0,<2.2.0-dev"
+        "symfony/css-selector":  ">=2.0,<2.3-dev"
     },
 
     "suggest": {
@@ -40,5 +31,11 @@
         "psr-0": {
             "Behat\\Mink": "src/"
         }
+    },
+
+    "extra": {
+        "branch-alias": {
+            "dev-develop": "1.4-dev"
+        }
     }
 }

phpunit.xml.dist

@@ -2,7 +2,7 @@
 
 <phpunit backupGlobals="false"
          backupStaticAttributes="false"
-         colors="false"
+         colors="true"
          convertErrorsToExceptions="true"
          convertNoticesToExceptions="true"
          convertWarningsToExceptions="true"

src/Behat/Mink/ClassLoader/MapFileClassLoader.php

@@ -73,4 +73,4 @@ public function findFile($class)
             return $this->map[$class];
         }
     }
-}
+}