Add missing changes for mediawiki upgrades

cookbooks/composer/README.md

@@ -159,7 +159,7 @@ end
 ## License and Authors
 
 Author: David Joos <development@davidjoos.com>
-Copyright: 2016, David Joos
+Copyright: 2016-2017, David Joos
 
 Author: David Joos <david.joos@escapestudios.com>
 Author: Escape Studios Development <dev@escapestudios.com>

cookbooks/composer/attributes/default.rb

@@ -14,7 +14,7 @@ if node['platform'] == 'windows'
   default['composer']['global_install']['install_dir'] = 'C:\\Program\ Files\\Composer'
   default['composer']['global_install']['bin_dir'] = 'C:\\ProgramData\\Composer'
 else
-  default['composer']['url'] = 'http://getcomposer.org/composer.phar'
+  default['composer']['url'] = 'http://getcomposer.org/composer-stable.phar'
   default['composer']['install_dir'] = '/usr/local/bin'
   default['composer']['bin'] = "#{node['composer']['install_dir']}/composer"
   default['composer']['install_globally'] = true
@@ -27,3 +27,4 @@ end
 default['composer']['global_configs'] = {}
 default['composer']['home_dir'] = nil
 default['composer']['php_recipe'] = 'php::default'
+default['composer']['self_update_channel'] = nil

cookbooks/composer/metadata.rb

@@ -4,9 +4,10 @@ maintainer_email 'development@davidjoos.com'
 license 'MIT'
 description 'Installs/Configures Composer'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version '2.6.1'
+version '2.7.0'
+chef_version '>= 0.10.0' if respond_to?(:chef_version)
 
-%w(debian ubuntu redhat centos fedora scientific amazon windows).each do |os|
+%w[debian ubuntu redhat centos fedora scientific amazon windows].each do |os|
   supports os
 end
 

cookbooks/composer/providers/install_global.rb

@@ -13,17 +13,14 @@ end
 
 action :install do
   install_global_install
-  new_resource.updated_by_last_action(true)
 end
 
 action :remove do
   install_global_remove
-  new_resource.updated_by_last_action(true)
 end
 
 action :update do
   install_global_update
-  new_resource.updated_by_last_action(true)
 end
 
 def install_global_install

cookbooks/composer/providers/project.rb

@@ -13,7 +13,6 @@ end
 
 action :install do
   make_execute 'install'
-  new_resource.updated_by_last_action(true)
 end
 
 action :require do
@@ -22,12 +21,10 @@ end
 
 action :update do
   make_execute 'update'
-  new_resource.updated_by_last_action(true)
 end
 
 action :dump_autoload do
   make_execute 'dump-autoload'
-  new_resource.updated_by_last_action(true)
 end
 
 action :remove do

cookbooks/composer/recipes/install.rb

@@ -10,9 +10,9 @@ include_recipe node['composer']['php_recipe']
 if node['platform'] == 'windows'
   windows_package 'Composer - PHP Dependency Manager' do
     source node['composer']['url']
-    options %w(
+    options %w[
       /VERYSILENT
-    ).join(' ')
+    ].join(' ')
   end
 
   install_dir = "#{node['composer']['install_dir'].tr('/', '\\')}\\bin"

cookbooks/composer/recipes/self_update.rb

@@ -7,9 +7,15 @@
 
 include_recipe 'composer::install'
 
+channel = if node['composer']['self_update_channel'].nil?
+            ''
+          else
+            " --#{node['composer']['self_update_channel']}"
+          end
+
 execute 'composer-self_update' do
   cwd node['composer']['install_dir']
-  command 'composer self-update'
+  command 'composer self-update' + channel
   environment 'COMPOSER_HOME' => Composer.home_dir(node)
   action :run
   ignore_failure true

cookbooks/composer/resources/install_global.rb

@@ -17,8 +17,3 @@ attribute :quiet, :kind_of => [TrueClass, FalseClass], :default => true
 attribute :optimize_autoloader, :kind_of => [TrueClass, FalseClass], :default => false
 attribute :prefer_dist, :kind_of => [TrueClass, FalseClass], :default => false
 attribute :prefer_source, :kind_of => [TrueClass, FalseClass], :default => false
-
-def initialize(*args)
-  super
-  @action = :install
-end

cookbooks/composer/resources/project.rb

@@ -22,8 +22,3 @@ attribute :user, :kind_of => String, :default => 'root'
 attribute :group, :kind_of => String, :default => 'root'
 attribute :umask, :kind_of => [String, Integer], :default => '0002'
 attribute :environment, :kind_of => Hash, :default => {}
-
-def initialize(*args)
-  super
-  @action = :install
-end