Skip to content

Commit

Permalink
Merge pull request #291 from phase2/feature/remove_deprecated_code
Browse files Browse the repository at this point in the history
Removing deprecated code and documentation for v1.0 release
  • Loading branch information
arithmetric authored Jul 15, 2016
2 parents 121af69 + ca8cd8c commit f12ef97
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 21 deletions.
6 changes: 0 additions & 6 deletions Gruntfile.js

This file was deleted.

2 changes: 0 additions & 2 deletions docs/40_operations.md
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,6 @@ skip starting up watch tasks.
}
```

**serve.profile**: DEPRECATED - use **project.profile** instead.

**serve.port**: The port number to bind for the webserver. Only one service may
occupy a port on a machine, so a project-specific port may be worthwhile.
Defaults to `8080`.
Expand Down
6 changes: 1 addition & 5 deletions tasks/quality.js
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,7 @@ module.exports = function(grunt) {
var phpcs = phpcsConfig.dir || phpcsPatterns;
var phpStandard = phpcsConfig.standard ||
'vendor/drupal/coder/coder_sniffer/Drupal,vendor/drupal/coder/coder_sniffer/DrupalPractice';

// Support deprecated config.phpcs.ignoreExitCode value until 1.0.
var ignoreError = grunt.config('config.validate.ignoreError') ||
phpcsConfig.ignoreExitCode;
ignoreError = ignoreError === undefined ? false : ignoreError;
var ignoreError = grunt.config('config.validate.ignoreError');

grunt.config('phpcs', {
analyze: {
Expand Down
8 changes: 1 addition & 7 deletions tasks/serve.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,7 @@ module.exports = function(grunt) {
// If no path is configured for Drush, fallback to the system path.
var cmd = {cmd: Drupal.drushPath()};

// `config.serve.profile` is deprecated.
if (grunt.config('config.serve.profile')) {
grunt.log.warn('The `serve.profile` parameter is deprecated and will be ' +
'removed in future versions. Use `project.profile` instead.');
}
var profile = grunt.config('config.project.profile') ||
grunt.config('config.serve.profile') || 'standard';
var profile = grunt.config('config.project.profile') || 'standard';

grunt.config(['drush', 'liteinstall'], {
args: ['site-install', '-yv', profile, '--db-url=sqlite:/' +
Expand Down
2 changes: 1 addition & 1 deletion test/create_working_copy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# This script creates a working copy of grunt-drupal-tasks by initializing a
# project using the example in the test/working_copy directory.

if [ ! -f "Gruntfile.js" ]; then echo "This script should be run from the grunt-drupal-tasks directory."; exit 1; fi;
if [ ! -f "test/create_working_copy.sh" ]; then echo "This script should be run from the grunt-drupal-tasks directory."; exit 1; fi;

# If an old install exists, reset permissions on src/sites/default.
if [ -d "test/working_copy/src/sites/default" ]; then chmod 755 test/working_copy/src/sites/default/; fi;
Expand Down

0 comments on commit f12ef97

Please sign in to comment.