Commit 74840af0 authored by Claudiu Cristea's avatar Claudiu Cristea
Browse files

Issue #3304087 by claudiu.cristea, Project Update Bot: Automated Drupal 10 compatibility fixes

parent eff47905

composer.json

+1 −7
Original line number Diff line number Diff line
@@ -10,12 +10,6 @@ 
    },

    "minimum-stability": "dev",

    "require": {

        "drupal/og": "^1.0.0-alpha6"

    },

    "repositories": {

        "drupal": {

            "type": "composer",

            "url": "https://packages.drupal.org/8"

        }

        "drupal/og": "^1.0"

    }

}

drupalci.yml

0 → 100644
+30 −0
Original line number Diff line number Diff line 
build:

  assessment:

    validate_codebase:

      phplint:

        halt-on-fail: true

      phpcs:

        sniff-all-files: false

        halt-on-fail: true

    testing:

#      run_tests.phpunit:

#        types: 'PHPUnit-Unit'

#        testgroups: '--all'

#        suppress-deprecations: true

#        halt-on-fail: false

      run_tests.kernel:

        types: 'PHPUnit-Kernel'

        testgroups: '--all'

        suppress-deprecations: true

        halt-on-fail: false

#      run_tests.functional:

#        types: 'PHPUnit-Functional'

#        testgroups: '--all'

#        suppress-deprecations: true

#        halt-on-fail: false

#      run_tests.javascript:

#        concurrency: 15

#        types: 'PHPUnit-FunctionalJavascript'

#        testgroups: '--all'

#        suppress-deprecations: true

#        halt-on-fail: false

og_menu.behat.inc

+2 −1
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
 * Contains \OgMenuSubContext.

 */



use PHPUnit\Framework\Assert;

use Drupal\DrupalExtension\Context\DrupalSubContextBase;

use Drupal\DrupalExtension\Context\DrupalSubContextInterface;

use Drupal\og_menu\Tests\Traits\OgMenuTrait;
@@ -35,7 +36,7 @@ class OgMenuSubContext extends DrupalSubContextBase implements DrupalSubContextI 
    $menu_instance = $this->getOgMenuInstance($group->id(), $menu);

    $tree = $this->getOgMenuTree($menu_instance);



    PHPUnit_Framework_Assert::assertEquals($count, count($tree));

    Assert::assertEquals($count, count($tree));

  }



  /**

og_menu.info.yml

+2 −2
Original line number Diff line number Diff line
@@ -3,6 +3,6 @@ type: module 
description: "Allow group creators and site admins to edit their own group menu."

dependencies:

  - drupal:menu_ui

  - og:og (>=8.x-1.0-alpha4)

  - og:og

package: "Organic groups"

core_version_requirement: ^8.8 || ^9
 
core_version_requirement: ^8.8 || ^9 || ^10

ogmenu_instance.page.inc

+0 −3
Original line number Diff line number Diff line
@@ -8,8 +8,6 @@ 
 */



use Drupal\Core\Render\Element;

use Drupal\Core\Link;

use Drupal\Core\Url;



/**

 * Prepares variables for OG Menu instance templates.
@@ -27,4 +25,3 @@ function template_preprocess_ogmenu_instance(array &$variables) { 
    $variables['content'][$key] = $variables['elements'][$key];

  }

}