Merge branch 'develop' into release

.editorconfig

@@ -14,4 +14,4 @@ end_of_line = crlf
 
 [*.yml]
 indent_style = space
-indent_size = 2
+indent_size = 2

.gitignore

@@ -59,6 +59,7 @@ composer.lock
 /nbproject
 .idea
 *.mo
+.project
 
 # IDE and editor specific files #
 #################################

.travis.yml

@@ -77,22 +77,35 @@ matrix:
         - sudo mysql_upgrade
         - sudo service mysql restart
 
+    # PHP 7.0 / MYSQL 5.6
+    - php: 7.0
+      env: DB=mysql MYSQL_VERSION=5.6
+      dist: trusty
+      sudo: required
+      addons: &php7_addon
+        apt:
+          packages:
+            - *common_pkg
+
   allow_failures:
     - php: 5.6
       env: DB=mysql MYSQL_VERSION=5.7
+    - php: 7.0
+      env: DB=mysql MYSQL_VERSION=5.6
 
 before_script:
   - wget http://getcomposer.org/composer.phar
   - php composer.phar install --dev --no-interaction
   - sh -c "if [ '$DB' = 'mysql' ]; then mysql -e 'CREATE DATABASE passbolt;'; fi"
   - sh -c "if [ '$DB' = 'mysql' ]; then mysql -e 'CREATE DATABASE passbolt_test;'; fi"
   - chmod -R 777 ./app/tmp
-  - if [[ ${TRAVIS_PHP_VERSION:0:3} == "5.3" ]] ; then pecl install timezonedb ; fi
   - sh -c "if [ '$PHPCS' = '1' ]; then composer global require 'cakephp/cakephp-codesniffer:1.*'; fi"
   - sh -c "if [ '$PHPCS' = '1' ]; then ~/.composer/vendor/bin/phpcs --config-set installed_paths ~/.composer/vendor/cakephp/cakephp-codesniffer; fi"
   - echo yes | pecl install gnupg
   - echo "extension = memcached.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
-  - if [[ ${TRAVIS_PHP_VERSION:0:3} == "7.0" ]] ; then print "yes" | pecl install apcu-5.1.3; else print "yes" | pecl install apcu-4.0.11; fi
+  - if [[ $TRAVIS_PHP_VERSION = 5.5 ]] ; then echo yes | pecl install apcu-4.0.10; fi
+  - if [[ $TRAVIS_PHP_VERSION = 5.6 ]] ; then echo yes | pecl install apcu-4.0.10; fi
+  - if [[ $TRAVIS_PHP_VERSION = 7.0 ]] ; then echo yes | pecl install channel://pecl.php.net/apcu-5.1.5; fi
   - echo -e "extension = apcu.so\napc.enable_cli=1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
   - phpenv rehash
   - set +H
@@ -124,6 +137,7 @@ before_script:
   - sed -i "s/76859309657453542496749683645/76859309357453542496749683645/" ./app/Config/core.php
   - sed -i "s/\/\/Configure::write('App.fullBaseUrl',\s'http:\/\/example.com');/Configure::write('App.fullBaseUrl', 'http:\/\/127.0.0.1');/" ./app/Config/core.php
   - sed -i "s/\/\/date_default_timezone_set('UTC');/date_default_timezone_set('UTC');/" ./app/Config/core.php
+  - if [[ $TRAVIS_PHP_VERSION = 7.0 ]] ; then sed -i "s/'defaults' => 'cache'/'defaults' => 'php'/" ./app/Config/core.php ; fi
   - echo "<?php
     \$config = array(
       'App' => array(
@@ -147,10 +161,11 @@ before_script:
 
 script:
   - mkdir -p build/logs
-  - app/Console/cake test app All --stderr --coverage-clover build/logs/clover.xml --configuration=app/Test/phpunit.xml
+  - if [[ $TRAVIS_PHP_VERSION = 5.6 ]] ; then app/Console/cake test app All --stderr --coverage-clover build/logs/clover.xml --configuration=app/Test/phpunit.xml ; fi
+  - if [[ $TRAVIS_PHP_VERSION != 5.6 ]] ; then app/Console/cake test app All --stderr --configuration=app/Test/phpunit.xml ; fi
 
-after_script:
-  - php Vendor/bin/coveralls -v
+after_success:
+  - if [[ $TRAVIS_PHP_VERSION = 5.6 ]] ; then php Vendor/bin/coveralls -v ; fi
 
 notifications:
   email: false

CHANGELOG.md

@@ -2,6 +2,14 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [1.5.1] - 2017-05-23
+### Fixed
+- PASSBOLT-2070: Delete unused code / exclude external libs from coverage
+- PASSBOLT-2071: Drop exec bits from files which don't need them (@OdyX GITHUB PR #67)
+- PASSBOLT-2073: As AP I should see a warning on the login page if the plugin and the api are not compatible
+- PASSBOLT-2029: PHP7 compatibility, fix deprecated cakePHP String class calls (@leomazzo GITHUB-64)
+- PASSBOLT-2074: Delete confirmation dialogs should fit the latest styleguide
+
 ## [1.5.0] - 2017-05-16
 ### Added
 - PASSBOLT-1950: As a user I can see which groups a password is shared with from the sidebar
@@ -235,7 +243,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - AP: User with plugin installed
 - LU: Logged in user
 
-[Unreleased]: https://github.com/passbolt/passbolt_api/compare/v1.5.0...HEAD
+[Unreleased]: https://github.com/passbolt/passbolt_api/compare/v1.5.1...HEAD
+[1.5.1]: https://github.com/passbolt/passbolt_api/compare/v1.5.0...v1.5.1
 [1.5.0]: https://github.com/passbolt/passbolt_api/compare/v1.4.0...v1.5.0
 [1.4.0]: https://github.com/passbolt/passbolt_api/compare/v1.3.2...v1.4.0
 [1.3.2]: https://github.com/passbolt/passbolt_api/compare/v1.3.1...v1.3.2

Gruntfile.js

@@ -32,7 +32,8 @@ module.exports = function(grunt) {
 				'<%= config.webroot %>/js/lib/underscore',
 				'<%= config.webroot %>/js/lib/xregexp',
 				'<%= config.webroot %>/js/lib/jssha',
-				'<%= config.webroot %>/js/lib/urijs'
+				'<%= config.webroot %>/js/lib/urijs',
+				'<%= config.webroot %>/js/lib/semver'
 			]
 		},
 		shell: {
@@ -159,11 +160,18 @@ module.exports = function(grunt) {
 					dest: '<%= config.webroot %>/js/lib/urijs/',
 					nonull: true,
 					expand: true
+				}, {
+					// semver
+					cwd: '<%= config.modules_path %>/semver/',
+					src: 'semver.js',
+					dest: '<%= config.webroot %>/js/lib/semver/',
+					nonull: true,
+					expand: true
 				}]
 			}
 		},
 		"steal-build": {
-			default: {
+			app: {
 				options: {
 					system: {
 						config: "./app/webroot/js/stealconfig.js",
@@ -173,6 +181,17 @@ module.exports = function(grunt) {
 						minify: true
 					}
 				}
+			},
+			login: {
+				options: {
+					system: {
+						config: "./app/webroot/js/stealconfig.js",
+						main: "app/login"
+					},
+					buildOptions: {
+						minify: true
+					}
+				}
 			}
 		}
 	});
@@ -209,9 +228,11 @@ module.exports = function(grunt) {
 	grunt.registerTask('lib-deploy', ['clean:lib', 'copy:lib', 'shell:mad_lib_patch']);
 
 	// Build mad & all the demos apps to ensure that everything compile
-	grunt.registerTask("build", ["steal-build"]);
+	grunt.registerTask("build", ["steal-build:app", "steal-build:login"]);
+	grunt.registerTask("build-app", ["steal-build:app"]);
+	grunt.registerTask("build-login", ["steal-build:login"]);
 
 	// 'grunt' default
-	grunt.registerTask('default', ["steal-build"]);
+	grunt.registerTask('default', ["steal-build:app", "steal-build:login"]);
 
 };

app/Config/version.php

@@ -1,7 +1,7 @@
 <?php
 $config = [
 	'App.version' => [
-		'number' => '1.5.0',
+		'number' => '1.5.1',
 		'name' => 'Grapevine'
 	],
 ];

app/Model/Group.php

@@ -15,7 +15,6 @@ class Group extends AppModel {
 
 	public $actsAs = [
 		'Trackable',
-		'SuperJoin',
 		'Containable'
 	];
 

app/Model/Resource.php

@@ -76,7 +76,6 @@ class Resource extends AppModel {
  * @link http://api20.cakephp.org/class/model#
  */
 	public $actsAs = [
-		'SuperJoin',
 		'Containable',
 		'Trackable',
 		'Favoritable',

app/Model/User.php

@@ -73,7 +73,6 @@ class User extends AppModel {
  * @link http://api20.cakephp.org/class/model#
  */
 	public $actsAs = [
-		'SuperJoin',
 		'Containable',
 		'Trackable'
 	];

app/Plugin/FileStorage/Event/ImageProcessingListener.php

@@ -363,7 +363,7 @@ protected function _tmpFile($Storage, $path) {
 				mkdir(TMP . 'image-processing');
 			}
 
-			$tmpFile = TMP . 'image-processing' . DS . String::uuid();
+			$tmpFile = TMP . 'image-processing' . DS . CakeText::uuid();
 			file_put_contents($tmpFile, $Storage->read($path));
 
 			return $tmpFile;

app/Plugin/FileStorage/Event/LocalImageProcessingListener.php

@@ -197,7 +197,7 @@ protected function _tmpFile($Storage, $path) {
 				mkdir(TMP . 'image-processing');
 			}
 
-			$tmpFile = TMP . 'image-processing' . DS . String::uuid();
+			$tmpFile = TMP . 'image-processing' . DS . CakeText::uuid();
 			$imageData = $Storage->read($path);
 
 			file_put_contents($tmpFile, $imageData);

app/Plugin/FileStorage/Model/FileStorage.php

@@ -250,7 +250,7 @@ public function tmpFile($folder = null, $checkAndCreatePath = true) {
 			new Folder($path, true);
 		}
 
-		return $path . String::uuid();
+		return $path . CakeText::uuid();
 	}
 
 /**

app/Test/Case/Model/UserTest.php

@@ -160,7 +160,7 @@ public function testGetAnonymous() {
 	 */
 	public function testSetActive() {
 		// Try to get a user that doesn't exist
-		$user = User::setActive(String::UUID());
+		$user = User::setActive(CakeText::uuid());
 		$this->assertEquals($user, false, 'User::setActive should return false');
 	}
 

app/Test/phpunit.xml

@@ -6,9 +6,14 @@
             <directory suffix=".php">../Controller</directory>
             <directory suffix=".php">../Model</directory>
             <directory suffix=".php">../View</directory>
-            <!--<exclude>-->
-                <!--<directory suffix=".php">../Console</directory>-->
-            <!--</exclude>-->
+            <exclude>
+                <file>../Console/cake.php</file>
+                <file>../Console/build_po.php</file>
+                <file>../Console/Command/SchemaShell.php</file>
+                <file>../Console/Command/Task/FixtureTask.php</file>
+                <file>../Model/Behavior/TrackableBehavior.php</file>
+                <!--<directory suffix=".php">../tests</directory>-->
+            </exclude>
         </whitelist>
     </filter>
 </phpunit>